[tor-commits] [tor/maint-0.2.2] Merge branch 'bug2750-v3' into bug2948