Nick Mathewson 3f40d9ec20 Merge branch 'maint-0.3.0' %!s(int64=7) %!d(string=hai) anos
..
.dummy df76da0f3b Add a .dummy file in the changes directory to stop git from removing it %!s(int64=9) %!d(string=hai) anos
geoip-june2017 104e8fa751 Update geoip and geoip6 to the June 8 2017 database. %!s(int64=7) %!d(string=hai) anos