[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'dgoulet/bug22159_031_01' into maint-0.3.1