[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug10363_024_squashed'

[nickm at torproject.org]

commit 595303fd1e1998e12c51901f1aea77311e973a44
Merge: 84df7d7 6d9c332
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 7 23:03:04 2014 -0400

    Merge remote-tracking branch 'public/bug10363_024_squashed'

 changes/bug10363     |   12 ++++++++++++
 src/common/compat.c  |   20 ++++++++++++++------
 src/ext/eventdns.c   |    5 +++--
 src/or/channeltls.c  |   23 +++++++++++++++--------
 src/test/test_util.c |    4 ++++
 5 files changed, 48 insertions(+), 16 deletions(-)