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