commit a73dec16c539fd957ab09f242cd44b0a0858cd38 Merge: 79b31dd 19136f6 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Sep 12 16:28:59 2012 -0400 Merge branch 'bug6815' changes/bug6815 | 6 ++++++ src/or/circuitbuild.c | 2 +- src/or/directory.c | 48 ++++++++++++++++++++++++++++++++---------------- src/or/directory.h | 20 +++++++++++++++++--- src/or/networkstatus.c | 2 +- src/or/rendclient.c | 3 ++- src/or/rendservice.c | 3 ++- src/or/router.c | 2 +- src/or/routerlist.c | 2 +- 9 files changed, 63 insertions(+), 25 deletions(-)