[tor-commits] [tor/master] Make check-changes pass on changes/bug25398