[tor-commits] [tor/maint-0.3.2] Merge branch 'bug23816_029_squashed' into maint-0.3.2