commit 66e99096b32e4b10620eef40a66228b027a54106 Merge: 5fbb52d10 909c91049 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Dec 1 09:35:36 2017 -0500 Merge branch 'maint-0.3.2' "ours" merge to avoid version bump.