commit 1693cee66e05c4d0b55cdfa392f36e85718c2588 Merge: 1949c7823 bae96cf1d Author: Nick Mathewson <nickm at torproject.org> Date: Mon Oct 23 08:47:59 2017 -0400 Merge branch 'maint-0.3.2'