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

[nickm at torproject.org]

commit 2452302354fdd6d34e1637380ffc73af067fd904
Merge: 0fd8f57 a5610cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Aug 25 00:34:23 2013 -0400

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

 changes/bug9366        |    4 ++++
 changes/bug9543        |    4 ++++
 changes/bug9546        |   11 +++++++++++
 src/or/channeltls.c    |   14 ++++++++++++--
 src/or/config.c        |   17 +++++++++++++++++
 src/or/connection_or.c |    9 ++++++++-
 src/or/or.h            |    3 +++
 7 files changed, 59 insertions(+), 3 deletions(-)