commit 64b0ee2e10c3eab605c66b0698a6a47de9cd6918 Merge: 2eac715 dff390d Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 7 09:23:14 2017 -0500 Merge branch 'maint-0.2.9'