commit d0d9afa5f99da2fb7df61974647308ce540ad417 Merge: 82ce0be 3f2d1f7 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 5 12:01:11 2017 -0400

Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux

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