commit 46910c060f6d0065f1745500e2bef89da8f8801a parent d83c299eba8010204b3fe0760b1372c7564889fe Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 21 Feb 2019 09:50:46 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump.