[tor-commits] [tor/master] changes for 14847