commit d7259b64d41a29781b3150badccec093a7a0ef30 Merge: fe3331b84 fee2eaf2d Author: Nick Mathewson <nickm at torproject.org> Date: Fri Jan 4 15:04:58 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4