[tor-commits] [tor/master] Merge remote-tracking branch 'ahf/bugs/21654'

commit 85782e111a41fa432df58e40b57ec55710a914e1 Merge: a9b046c 02fc0a5 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 9 08:36:46 2017 -0500

Merge remote-tracking branch 'ahf/bugs/21654'

changes/bug20988 | 4 -- changes/bug21654 | 4 ++ src/common/compat.c | 39 ------------- src/common/compat.h | 2 - src/common/util.c | 146 +++++++++++++++++----------------------------- src/common/util.h | 11 ++-- src/or/dirserv.c | 4 +- src/or/geoip.c | 2 +- src/test/test_pt.c | 6 +- src/test/test_util.c | 132 +++++++++++++++++++++-------------------- src/test/test_util_slow.c | 4 +- 11 files changed, 138 insertions(+), 216 deletions(-)