Merge pull request #12236 from ja-pa/tor-0.4.3.5