commit d8196dc200b9a21af53313999551c7c081a5c8f4
Merge: 3d18903f5 63eed6edf
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Jan 7 10:22:13 2019 -0500
Merge branch 'maint-0.3.3' into maint-0.3.4
"ours" merge to avoid version bump.