commit 44e192db30aa1b0adbf2593d7499d95dc9a059e1 Merge: 1ba52d0 f9636eb Author: Nick Mathewson <nickm at torproject.org> Date: Thu Dec 8 11:03:36 2016 -0500 Merge branch 'maint-0.2.9'