commit b766d00eeaa71357ac7ab412eac26bcc5f502ab8 Merge: c4c5ee8 946661d Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 7 08:55:43 2017 -0500 Merge branch 'maint-0.2.9'