commit e553bf3ce4b68a752f5f75c9f2e78cfc45c68f2a Merge: bfc9be4c7 736e7299c Author: Nick Mathewson <nickm at torproject.org> Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2