commit d5e4b6983f88d6a31303008897e6f75e9a9777ff Merge: 987174cc6 39bbb8d9c Author: Nick Mathewson nickm@torproject.org Date: Sun Jun 17 19:32:08 2018 -0400

Merge remote-tracking branch 'rl1987/bug26282'

changes/bug26282 | 4 ++++ src/common/util.c | 4 ++-- src/or/control.c | 2 +- src/or/geoip.c | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-)