commit 3e07a54928c3b14b4eb86b05251564c3e16504c4 Merge: 67cec75 f93bcab Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 28 10:38:31 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 This is an "ours" merge to avoid taking a version bump