commit 2ee1a084f2432a0bda8273a17b6fc9b5dbdc21f5 Merge: 069728bdd bf91b6e05 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 1 11:24:09 2017 -0400 Merge branch 'maint-0.3.1'