Nick Mathewson 539466e568 Merge remote-tracking branch 'origin/patches-2.0' ...

Conflicts:
	Makefile.am
	WIN32-Code/event2/event-config.h
	configure.in

2012-02-10 17:33:50 -05:00

..

dns-example.c

Merge remote-tracking branch 'origin/patches-2.0'

2011-11-14 11:45:17 -05:00

event-test.c

Use "_WIN32", not WIN32: it's standard and we don't need to fake it

2011-05-25 20:03:15 -04:00

hello-world.c

Use "_WIN32", not WIN32: it's standard and we don't need to fake it

2011-05-25 20:03:15 -04:00

http-server.c

When including an -internal.h header outside the main tree, do so early

2012-01-24 16:08:00 -05:00

le-proxy.c

Use "_WIN32", not WIN32: it's standard and we don't need to fake it

2011-05-25 20:03:15 -04:00

Makefile.am

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

signal-test.c

Use "_WIN32", not WIN32: it's standard and we don't need to fake it

2011-05-25 20:03:15 -04:00

time-test.c

Use "_WIN32", not WIN32: it's standard and we don't need to fake it

2011-05-25 20:03:15 -04:00