[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3