commit 6f9ab69b6dbaf99d7dedaa5714b2fc69e51120ca Merge: 7dddef2a7 91188540a Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 13 11:18:02 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2