commit 34120549878aa05969b66d9564cdd902adeeb6be Merge: 5c5198e 1b28f36 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 20 14:47:13 2013 -0400

Merge remote-tracking branch 'public/bug8475_023' into maint-0.2.4

changes/bug8475 | 4 ++++ src/or/relay.c | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)