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

[nickm at torproject.org]

commit 15127476561a18a7074d8022f7b80ddfabbdc29b
Merge: a770e1c 173efa1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 18 14:32:18 2013 -0400

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

 changes/bug8059     |    6 ++++++
 src/or/channeltls.c |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)