commit 909c91049a424776c563363312f93dcdc4cdb241 parent 998a24712336c830ad9f73ddbb95c0f7d9ebffb0 Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 1 Dec 2017 09:35:31 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump.