[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into additional_rust_test_fixes

[nickm at torproject.org]

commit 3b606ff787967d4f51af79deb8313210e4ca5754
Merge: 6c3ad4cae f91ea506f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 20 17:53:51 2018 -0400

    Merge branch 'maint-0.3.4' into additional_rust_test_fixes

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