[tor-commits] [tor/master] Merge branch 'feature23237'

[nickm at torproject.org]

commit 1b1eeb0fb916c424ac8836ca2ec357d25967e041
Merge: 22e688029 96aed28f1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 8 08:10:15 2017 -0400

    Merge branch 'feature23237'

 changes/feature23237 | 4 ++++
 src/or/geoip.c       | 9 +++++++++
 2 files changed, 13 insertions(+)