commit 069728bdd78d5fe4e3bed796ba0fc343a3ded3a8 Merge: a05ceaaeb 9b65d7f41 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 1 11:23:01 2017 -0400 Merge branch 'maint-0.3.1'