commit 332fe156798ff8346bb22f9377103e2c12e758a4 parent 34183f0d71c2e2d10e3d64291e3bb83a27c2416a Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 21 Feb 2019 09:51:38 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 "ours" to avoid version bump.