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