[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

[arma at torproject.org]

commit 7e0f1fa52adcf67d7b9c5459a3cc74f57bbfa3e2
Merge: 0c3c475 dece40f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 8 12:16:42 2013 -0400

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

 changes/bug6979 |    4 ++++
 src/or/router.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)