[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040