commit 1a877693da774acea626acb4349a80010b058563 Merge: 2a24ce965 98fc8cd93 Author: Nick Mathewson <nickm at torproject.org> Date: Sun Feb 11 18:11:04 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2