[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/feature3951' into maint-0.2.2