commit 55a3dad7083ae9931e9ca760fd6c27c5de3b8986 Merge: 8b0945081 274de0e2b Author: Nick Mathewson <nickm at torproject.org> Date: Wed Oct 25 09:29:01 2017 -0400 Merge branch 'maint-0.3.2'