Roger Dingledine 9f61d8a3b3 Merge branch 'maint-0.2.1' into release-0.2.1

2011-10-26 17:13:18 -04:00

..

bug1526

Fix zlib macro brokenness on osx with zlib 1.2.4 and higher.

2011-10-26 07:30:11 -04:00

bug2235

Don't crash when accountingmax is set in non-server Tors

2011-10-26 14:20:47 +02:00

bug2433

Fix assert for relay/bridge state change

2011-10-26 22:09:44 +02:00

bug2572

Don't crash a bridge authority on SIGHUP if it's not in the consensus

2011-10-26 22:09:44 +02:00

bug3208

Remove the -F option from tor-resolve.

2011-10-26 17:13:04 -04:00

bug3208b

manually backport a5232e0c4c

2011-10-26 17:11:52 -04:00

bug3228

Reinit keys at the start of options_act().

2011-10-26 22:09:44 +02:00