[tor-commits] [tor/master] Merge commit '110765f5564a588c5f019d32b5e6f66cc7806c41'