commit 1da5223e893fd61ed171782809ed9a55eb3503c7 Merge: 545cb5f 491ffa5 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Mar 30 10:15:35 2012 -0400 Merge branch 'bug5527' src/or/connection_or.c | 7 +---- src/or/dirserv.c | 55 +++++++++++++++++++++-------------------------- src/or/dirserv.h | 3 +- 3 files changed, 28 insertions(+), 37 deletions(-)