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

[nickm at torproject.org]

commit df23e280c4419762b3c800badd5992d84ee8797c
Merge: cdc960b e3ebae4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 11:59:57 2017 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

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