[tor-commits] [tor/master] Merge commit 'ef991b04e26eb4db'