commit b47f574c1e27b8665e9e2658409645a3831e7aa4 Merge: 8057b73 bcdffc0 Author: Nick Mathewson nickm@torproject.org Date: Thu May 12 00:14:10 2011 -0400

Merge branch 'bug1352' into maint-0.2.2

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