commit e209e8e3c1fa524a994e02562878f4c738b0e54e Merge: b9da340cd cf1e6ad2d Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 13 11:19:12 2017 -0500 Merge branch 'maint-0.3.2'