Roger Dingledine 8aec982f91 Merge branch 'maint-0.2.1' ... Conflicts: ChangeLog configure.in contrib/tor-mingw.nsi.in src/win32/orconfig.h		2010-04-03 22:05:02 -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