[tor-commits] [torbutton/master] Fold in maint-1.9.4 changes