commit b1cb9ebb1c6fb8d6126e2af143477d2e9ac24ead Merge: 898f2d7 4eff8b6 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 4 12:34:09 2013 -0500

Merge branch 'bug8146_etc'

changes/bug8146_etc | 13 +++++++++++++ src/or/dirserv.c | 46 +++++++++++++++++++++++++++++++++++----------- src/or/rephist.c | 15 +++++++++++++++ src/or/rephist.h | 2 ++ 4 files changed, 65 insertions(+), 11 deletions(-)