commit 9d75f7984641e0bff230bf22eb5d5b29383236d6 Merge: e9ff3e7d4 c4b6b5738 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Oct 29 15:57:31 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5