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

[nickm at torproject.org]

commit a3d1c38ea6e62dfd01771c39124b703807f22393
Merge: 42751e212 e18840f61
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 11 19:57:57 2018 -0500

    Merge branch 'bug24582'

 changes/bug24582        |  4 ++++
 src/tools/tor-resolve.c | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)