commit 4bd9c53237d96c8bb154433595ac87c5db9194b4 Merge: a8c388b0e 6f9ab69b6 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 13 11:18:02 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2