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