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

[nickm at torproject.org]

commit d75be189df970f0da3a59f649e3be9c5d57868c6
Merge: ec61ae5 33fcc0f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 12:02:15 2017 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9

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