commit 8b8d501040946bb2280a9640f91a55b7f17b03e3 parent 6a7aa4735724cdf8d37e4109705338a1ea947449 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 23 Oct 2017 09:22:43 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid taking af33fdd7c1860399fe8d6861c163e5d64b0292b9
