commit f24797a5870b685af98728002a0b0da73f582fda Merge: 398f15bdf f91ea506f Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 20 17:49:56 2018 -0400

Merge branch 'maint-0.3.4'

src/common/util.c | 4 ++-- src/or/control.c | 5 ++--- src/or/geoip.c | 1 - 3 files changed, 4 insertions(+), 6 deletions(-)