commit abcc7032ce9d1c272a6ee1d39e3851b410b41ac6 Merge: 3b2f4d139 bfc9be4c7 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Dec 11 16:50:48 2017 -0500 Merge branch 'maint-0.3.2'