commit 27ec0248d2460cdfc52462d313272c206ab46f02 Merge: 62c1311 419f541 Author: Roger Dingledine arma@torproject.org Date: Fri Jul 6 08:57:29 2012 -0400

Merge remote-tracking branch 'nickm/bug6271_part_a' into maint-0.2.3

changes/bug6271 | 7 +++++++ src/or/relay.c | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletions(-)