[tor-commits] [tor/maint-0.4.2] Merge branch 'pr1450_squashed' into maint-0.4.1