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

commit ef83db4fe85f2c73b5891d5b8e53ca776dc230f8 Merge: 68ea7d2 f8bb006 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Apr 24 22:16:07 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug6026 | 4 ++++ src/or/config.c | 3 ++- src/or/connection.c | 5 ++++- src/or/router.c | 31 ++++++++++++++++++++++++------- src/or/router.h | 5 ++++- 5 files changed, 38 insertions(+), 10 deletions(-)