commit 16deb1f5f2112bf19e5a8387cb4ebe7b04b5b360 Merge: fa05efdf8 fe3331b84 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Jan 4 14:57:06 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5