Nick Mathewson 9ae6e5959d Merge remote-tracking branch 'origin/patches-2.0' ...

Conflicts:
	sample/dns-example.c

2011-11-14 11:45:17 -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

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

2011-08-28 14:06:03 -04: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'

2011-09-25 07:41:29 -04: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