[tor-commits] [tor/master] Changes files for feature26815 and 26816