commit 1c64f99a1a74cac4074ddefa958fd4ae7acddcb2 Merge: 63dfc1d e13e9c4 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 17 16:05:09 2012 -0400

Merge remote-tracking branch 'public/bug5124'

changes/bug5124 | 4 ++++ src/or/dirserv.c | 2 +- src/or/policies.c | 3 +-- src/or/rephist.c | 2 +- src/or/router.c | 14 +++++++------- src/test/test_dir.c | 6 +++--- 6 files changed, 17 insertions(+), 14 deletions(-)