commit be0127ff09104b002756f47a6ba72277bb2f76d4 Merge: 3cf8da02f 5e08cf350 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 29 11:01:19 2017 -0400 Merge branch 'maint-0.3.1'