commit 4a49e134bc30ff1ab4693cffc9d88ad993758889 Merge: ee70e2ed6 990322fca Author: Nick Mathewson <nickm at torproject.org> Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1