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

2011-10-26 16:34:20 -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

bug3228

Reinit keys at the start of options_act().

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