[tor-commits] [tor/master] Merge commit '7b859fd8c558c9cf08add79db87fb1cb76537535'