commit 0abaedbf3469dfca8833867feef789c6d4e59225 Merge: f0b86e3 3bb49c0 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Nov 3 15:41:18 2016 -0400 Merge branch 'maint-0.2.9'