[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm at torproject.org]

commit 1ef83505db112fd123bbc43c7e8e7ba4ff77e161
Merge: 10c33a6 578a439
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 12:02:32 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22490 | 3 +++
 src/or/geoip.c   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)