[tor-commits] [tor/master] Merge branch 'bug4438-v2'