commit c018aa8196dd2417fa75a393c7a8d152ebf52365 Merge: 1693cee66 578eead1c Author: Nick Mathewson <nickm at torproject.org> Date: Mon Oct 23 08:53:25 2017 -0400 Merge branch 'maint-0.3.2'