[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit 899c2805b158e0e82ad6979a49b549793364c0d5
Merge: d404b02 dbdc994
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 18 15:57:51 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'

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