commit ce4a381935d9c0c2b4003a25fd611a11ada6a160 Merge: cef844d01 424ab08b5 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Nov 30 12:26:33 2017 -0500 Merge branch 'maint-0.3.2' "ours" to avoid version bump.