[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

commit 31ecbce3b8198340b10771aa5789262207b55865 Merge: b77889fc5 c78904b63 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Oct 24 12:57:26 2018 -0400 Merge branch 'maint-0.3.5'