[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9