commit eb00840ab88f07820397e00cdc2a62b87a0f52cd Merge: 7b9e79095 1a7779966 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Dec 21 12:42:11 2017 -0500 Merge branch 'maint-0.3.2' "ours" merge to avoid version bump.