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

[nickm at torproject.org]

commit 020c003a636a876a1b86295592e8782ab93df5a3
Merge: b104ea7 2e5220c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 14:39:00 2017 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

 src/or/geoip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)