commit 9cdb7a33c83aac71e864cfcdf59f140c55da7bb7 Merge: 54049cb6f 74bda3079 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Jan 4 15:04:58 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5