[tor-commits] [tor/master] Merge remote-tracking branch 'linus/bug6363_only-ln'

commit ec94d0307e06b9ea5732e86e369dcf5c727f05cb Merge: 730dd9a d34c690 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 4 18:23:18 2012 -0400

Merge remote-tracking branch 'linus/bug6363_only-ln'

changes/bug6363 | 3 + src/common/address.c | 12 +++++ src/common/address.h | 2 + src/or/dirserv.c | 48 ++++++++++++++------ src/or/dirvote.c | 123 +++++++++++++++++++++++++++++++++----------------- src/or/dirvote.h | 33 ++++++++++++- src/or/routerparse.c | 63 +++++++++++++++++++------ src/test/test_dir.c | 8 +++ 8 files changed, 218 insertions(+), 74 deletions(-)