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

[nickm at torproject.org]

commit 3c8a481599cf9c84530db1f304731b5f2ec9caef
Merge: 3e2b48f8b 6ed384b82
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 15 20:17:31 2018 -0500

    Merge branch 'bug18105'

 changes/18105        |  4 ++++
 src/common/address.c | 18 ++++++++----------
 src/common/compat.c  | 18 ++++++++++++++++++
 src/common/compat.h  |  2 ++
 src/or/connection.c  | 10 ++--------
 5 files changed, 34 insertions(+), 18 deletions(-)