commit 247c163acebdfe44223d4a90cf06229eb4fc52db Merge: 9f2936462 d85fbc9a5 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 25 13:50:37 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

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