commit d46b0a3c4870cf075431dfc6c4ac5c48d43dc5b1 Merge: d41b42660 c0e18d2f8 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Nov 15 16:47:25 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5