commit 931b2dbae537a4688a6c71deeb1ea0489efc456a Merge: 77a848b9d 469189d84 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Sep 12 09:24:33 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1