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

[nickm at torproject.org]

commit b059c38d8a134782d6a848e4c23f7ecb4555f0b6
Merge: 04b350b47 d85fbc9a5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 25 13:50:37 2018 -0400

    Merge branch 'maint-0.3.4'

 src/test/test_dir.c   | 14 +++++++-------
 src/test/test_geoip.c |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)