commit a46288252b28b81bb95dcf94fab53c8fb6e86ffc Merge: 929874908 5d37d2700 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2