commit 274de0e2bcffecea1c2d3bacefef13547a006974 parent e7126a1030233fd656cff4a8ee998026065fb65b Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 25 Oct 2017 09:28:57 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump
