commit db4873c46d80366c8eb0df0098ba18a10c0ad59b Merge: d7aab158d 5c4da2cac Author: Nick Mathewson <nickm at torproject.org> Date: Thu Dec 14 14:12:41 2017 -0500 Merge branch 'maint-0.3.2' "ours" merge to avoid version bump