Nick Mathewson 66624ded39 Merge remote-tracking branch 'origin/maint-0.2.4' ... Conflicts: src/or/relay.c		2013-10-08 13:38:47 -04:00
..
bug6979	Fix an assert when disabling ORPort with accounting disabled.	2013-09-18 10:26:32 -04:00
bug9596	Increase POLICY_BUF_LEN to 72 to accomodate IPv6 exit policy items.	2013-08-26 11:30:09 -04:00
bug9880	Fix a bug in our bug 9776 fix.	2013-10-02 22:20:18 -04:00
bug9922	Finish changelog message for 9922.	2013-10-08 12:02:34 -04:00
bug9926	Simply route length generation code.	2013-10-08 11:48:33 -04:00
bug9927	Generate bootstrapping status messages for microdescs too	2013-10-08 11:32:02 -04:00
ticket9866	Changes file for 9866	2013-10-07 11:32:06 -04:00