commit 69ff26b05c789e556c3e1401f5065ebf5e49c9d8 Merge: f287100 6b83b3b Author: Nick Mathewson nickm@torproject.org Date: Sun May 15 12:18:23 2011 -0400

Merge branch 'bug3026' into maint-0.2.2

changes/bug3026 | 4 ++++ src/or/directory.c | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-)