commit 2cfb7b0413d7f1e0b3c5004c8c2877c53b39244b Merge: a14ff6b9c 43fb8fc5c Author: Nick Mathewson <nickm at torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2