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

[nickm at torproject.org]

commit db2f18b1f92509de04be6cd973f9120e9c7be489
Merge: 26d9fff 578a439
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 12:02:47 2017 -0400

    Merge branch 'maint-0.3.0'

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