Nick Mathewson c38fa93ad1 Merge commit 'origin/maint-0.2.1' %!s(int64=14) %!d(string=hai) anos
..
1324-fetch-from-v3-not-v2 0324d3b0ec fetch relay descriptors from v3 authorities %!s(int64=14) %!d(string=hai) anos
dont_segfault_client_on_hup 80d9737e70 Fix a segfault when a client is hup'd. %!s(int64=14) %!d(string=hai) anos
read_circpriorityhalflife_correctly 96a0edf373 Rename CircPriorityHalflifeMsec to CircuitPriorityHalflifeMsec %!s(int64=14) %!d(string=hai) anos
static_zlib 71fb687ddd Add --enable-static-zlib option %!s(int64=14) %!d(string=hai) anos
use_ssl_option_everywhere 6ad09cc6af Fix renegotiation on OpenSSL versions that backport RFC5746. %!s(int64=14) %!d(string=hai) anos
weasel-testuite-thread-fixes 5e679acc72 testsuite: Prevent the main thread from starving the worker threads %!s(int64=14) %!d(string=hai) anos