Merge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9