[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

[nickm at torproject.org]

commit 8a873a5695ec07c9c052ef87bd42fb00f9bf672d
Merge: 96601a680 8afc100cb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 11 12:04:56 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2018-09-06 |     4 +
 src/config/geoip         | 49324 +++++++++++++--------------------------------
 src/config/geoip6        |  8574 ++++----
 3 files changed, 18629 insertions(+), 39273 deletions(-)