commit 9409d98ee930541937c9e6b8e09f7e3097f744c1 Merge: ef592d133 71248800f Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 1 14:39:08 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1