commit 74bda3079c97490e0cdae7368ef1bc6f1242bd47 Merge: 16deb1f5f d7259b64d Author: Nick Mathewson <nickm at torproject.org> Date: Fri Jan 4 15:04:58 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5