commit be197339ba5d17e12d3ad64496cb0f13ae2598fd Merge: b71f93f53 ff0516271 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Nov 2 09:09:01 2018 -0400 Merge branch 'maint-0.3.5'