[tor-commits] [tor/master] Modify 1 and delete 1 geoip A1 substitution.