[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'public/bug10777_nointernal_024' into maint-0.2.4

[arma at torproject.org]

commit 8836c1ee2f460422a688781c79760652524c3d6e
Merge: 7f6aa78 b15f75b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 11 18:55:26 2014 -0500

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

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