commit 6ddc4d5e27e4cc361f23943c8945e76ca2bc4d91 Merge: 026882fa3 751c71827 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 1 11:28:40 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1