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

[nickm at torproject.org]

commit dab25eb37dd7d5245a03a5380ba5f80c64e4ac3d
Merge: dffc8e3 a5ee383
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jan 13 21:43:53 2013 -0500

    Merge branch 'bug7935'

 changes/bug7935     |    4 ++++
 src/common/compat.h |    7 ++++++-
 src/ext/eventdns.c  |    4 ++++
 3 files changed, 14 insertions(+), 1 deletions(-)