commit 1f5a7917f5e742c9d64c835439a5ea337e9e934a Merge: 4aff97c 5ade278 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 12 11:10:59 2012 -0400

Merge remote-tracking branch 'public/bug6341_a_v2' into maint-0.2.3

changes/bug6341 | 5 +++++ src/or/relay.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)