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