[tor-commits] [tor/maint-0.4.4] Merge branch 'tor-github/pr/1937' into maint-0.4.4