commit 9120ac2218cd7872b7065ab829f061a6287941c2 Merge: 5d37d2700 35574d4a9 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Oct 23 08:47:58 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1