[tor-commits] [tor/release-0.2.3] Merge remote-tracking branch 'public/bug6507' into maint-0.2.3

[arma at torproject.org]

commit 676f71054f11727fdfa8707979d8c6fe143c9333
Merge: a74d418 d993b04
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 17 12:33:17 2012 -0400

    Merge remote-tracking branch 'public/bug6507' into maint-0.2.3

 changes/bug6507      |   15 +++++
 src/or/config.c      |  161 ++++++++++++++++++++++++++++++++++----------------
 src/or/directory.c   |    2 +-
 src/or/directory.h   |    2 +-
 src/or/dirserv.c     |   12 ++--
 src/or/or.h          |   35 +++++++++--
 src/or/router.c      |    5 +-
 src/or/routerparse.c |    2 +-
 8 files changed, 164 insertions(+), 70 deletions(-)