[tor-commits] [tor/master] fold in changes for 0.2.3.12-alpha