[tor-commits] [torspec/master] Merge branch 'bug16852_more'