commit 95c3cc2b904f6bf7e5d381193b9e59ec32a2713c Merge: a05a11306 1ae911660 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Oct 19 14:21:01 2018 -0400 Merge branch 'maint-0.3.5'