[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

[arma at torproject.org]

commit 4a1d9726f4d6e212ec2f0e1ac90a3f09ca27c853
Merge: 2b9fb51 8d0fb3a
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun Jul 28 09:50:19 2013 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bug9309     |    6 ++++++
 changes/bug9337     |    4 ++++
 src/or/channel.c    |    4 ++--
 src/or/channeltls.c |    5 ++---
 src/or/dns.c        |    8 ++++----
 5 files changed, 18 insertions(+), 9 deletions(-)