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