commit 10ae2f3e2977fb9491d3250048c1e6d6d405fbef Merge: 372262b 81fe193 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 26 16:42:13 2011 -0400

Merge branch 'bug3814'

changes/bug3814 | 4 ++++ src/or/directory.c | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-)