commit 2eac7155827b2216b6d60c38554cbddf15a7d719 Merge: b766d00 3e5b1c2 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 7 09:20:59 2017 -0500 Merge branch 'maint-0.2.9'