commit 3d8fcbcbad6c1c41be2745ecfe9f08aad07cdf5f Merge: 339ff694a 0ea508ec6 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Nov 2 13:02:02 2018 -0400 Merge branch 'maint-0.3.5'