Merge branch 'tor-github/pr/1912' into maint-0.3.5