Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.2