[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6