[tor-commits] [tor/release-0.3.5] Fold in the entry for 2667