[tor-commits] [tor/master] Merge branch 'bug27968_squashed' into maint-0.3.5