commit 0c1586d1b8ca68b49b0a38f596b03ca98feb6297 Merge: 590cfe2 054d7c5 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Jun 28 13:58:37 2017 -0400 Merge branch 'maint-0.3.1'