commit 139bda4fe48e0cdba68c9e802be983fb971e55be Merge: 9d8d4cb3f 314652dc1 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Sep 18 09:40:40 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0