[tor-commits] [tor/master] Tweak addressmap_rewrite a little more