commit c4c5ee8cd4cb693623e922aaeb723f011784fd88 Merge: 54ec335 0f46f7d Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 7 08:39:48 2017 -0500 Merge branch 'maint-0.2.9'