[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/bug26525'

[nickm at torproject.org]

commit 03283c00d86f9affe9d369b3e0f116770d4e0ec6
Merge: 47859e11e 439b528f2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 09:31:12 2018 -0400

    Merge remote-tracking branch 'rl1987/bug26525'

 changes/bug26525          |  4 ++++
 src/core/mainloop/main.c  |  4 ++--
 src/lib/net/address.c     |  4 ++--
 src/lib/net/resolve.c     | 18 +++++++++---------
 src/lib/net/resolve.h     | 21 +++++++++------------
 src/lib/sandbox/sandbox.c |  2 +-
 6 files changed, 27 insertions(+), 26 deletions(-)