commit c5a216fe1bf2dc19fbe71680a78b98c51e7db190 Merge: af85a0f28 74bda3079 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Jan 4 15:04:58 2019 -0500 Merge branch 'maint-0.3.5'