Merge pull request #12893 from ja-pa/tor-0.4.3.6