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