[tor-commits] [tor/master] Merge branch 'arthuredelstein_18859+1_031' into maint-0.3.2