Merge branch 'tor-github/pr/1792' into maint-0.4.3