[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'public/bug18100_029' into maint-0.2.9