commit 16ec4da68c1e683d713b29f0408f504dbe635116 Merge: abcc7032c e553bf3ce Author: Nick Mathewson <nickm at torproject.org> Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.2'