[tor-commits] [tor/release-0.2.4] Merge branch 'bug7947' into maint-0.2.4

[arma at torproject.org]

commit dbdc99483df6f0fdba9f7af8954719d47990a8b8
Merge: aa4fcc4 bd9901b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 18 15:56:55 2013 -0400

    Merge branch 'bug7947' into maint-0.2.4

 changes/bug7947 |    4 ++++
 src/or/relay.c  |    8 ++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)