commit 461771ebbce3a86965eb2d696f9d42e9bcb777c9 Merge: 6f5a740 db81cdb Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 24 11:18:41 2012 -0400

Merge branch 'bug4438-v2'

changes/bug4438 | 6 ++++++ src/or/router.c | 20 ++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-)