[tor-commits] [tor/master] Merge remote-tracking branch 'isis/bug22636_0.3.1_squashed' into maint-0.3.1