commit f69797b67cab3c5ad62d5a666b2919c3d29ef1e3 Merge: 84c4a2bc3 8500f0e4e Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 1 11:28:39 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0