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