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

[nickm at torproject.org]

commit a9b046cef75fc96a9fe2caaab12b115ce6df6657
Merge: ad19f15 ded2c8c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 8 10:12:44 2017 -0500

    Merge branch 'maint-0.3.0'

 changes/geoip-march2017 |     4 +
 src/config/geoip        | 13115 +++++++++++++++++++---------------------------
 src/config/geoip6       |   754 ++-
 3 files changed, 5884 insertions(+), 7989 deletions(-)