commit ffaf180b7e11897efaf874ec2ddcc72a8a2e67e5 Merge: 484b25960 f7e93cf2e Author: Nick Mathewson <nickm at torproject.org> Date: Wed Oct 10 17:12:34 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4