commit d78bb2df0ee9366efc5b25a40684d7ab9451da37 Merge: e86f122 8b6d0bd Author: Roger Dingledine arma@torproject.org Date: Fri Jun 14 04:07:30 2013 -0400
Merge branch 'maint-0.2.4' into release-0.2.4
changes/bug8639 | 5 ++ changes/bug8822 | 5 ++ changes/bug8965 | 3 + changes/bug9047 | 6 ++ changes/bug9063 | 3 + doc/HACKING | 20 +++-- doc/TODO | 3 - doc/contrib/authority-policy.txt | 89 ------------------- doc/contrib/tor-rpm-creation.txt | 56 ++++++++++++ doc/contrib/torel-design.txt | 181 ------------------------------------- doc/include.am | 2 - doc/spec/README | 11 --- doc/tor-rpm-creation.txt | 56 ------------ doc/tor-win32-mingw-creation.txt | 119 ------------------------- doc/translations.txt | 182 -------------------------------------- doc/v3-authority-howto.txt | 84 ------------------ src/common/compat.c | 15 ++++ src/common/compat.h | 1 + src/or/control.c | 23 +++-- src/or/dirserv.c | 2 +- src/or/dnsserv.c | 15 ++++ src/or/microdesc.c | 45 +++++++--- src/or/or.h | 9 ++ src/or/relay.c | 28 +++++- src/test/test_microdesc.c | 16 +++- 25 files changed, 224 insertions(+), 755 deletions(-)