[tor-commits] [tor/release-0.3.2] Merge branch 'bug24895_031_02' into bug24895_032_02