[tor-commits] [tor/master] Merge branch 'bug17852_revised'

[nickm at torproject.org]

commit 5cd6c577df3b3f59a8380b03e45d437aa593d326
Merge: 1f679d4 75daeb5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 16 11:34:06 2016 -0500

    Merge branch 'bug17852_revised'

 changes/bug17852    | 10 ++++++++
 src/common/compat.c |  7 +++--
 src/common/util.c   | 73 +++++++++++++++++++++++++++++++++++++++++++++--------
 src/ext/eventdns.c  | 15 ++++-------
 4 files changed, 83 insertions(+), 22 deletions(-)