[tor-commits] [tor/master] Merge branch 'bug22915_029_2' into maint-0.2.9