Nick Mathewson 7221d15acc Merge commit 'origin/maint-0.2.1' ...

Conflicts:
	src/or/test.c

2010-04-12 18:22:06 -04:00

..

1324-fetch-from-v3-not-v2

fetch relay descriptors from v3 authorities

2010-04-03 21:53:29 -04:00

dont_segfault_client_on_hup

Fix a segfault when a client is hup'd.

2010-04-03 12:31:59 +02:00

weasel-testuite-thread-fixes

testsuite: Prevent the main thread from starving the worker threads

2010-04-12 18:15:20 -04:00