[tor-commits] [tor/release-0.3.0] Merge remote-tracking branch 'public/bug21472_030' into maint-0.3.0