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