commit 3cfceeb45d51f8f3c4960cabaad1849dcecb14a3 Merge: f0633bc49 a5bbe3f1d Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3