[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2