[tor-commits] [torspec/master] Merge remote-tracking branch 'donncha/feature14846_2'