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

[nickm at torproject.org]

commit 578a4392e94faaa85ae79dfe1d4e7e93d0700de5
Merge: 41ed9e9 d75be18
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 12:02:26 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

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