[tor-commits] [tor/master] Merge branch 'ticket21799' into maint-0.3.0