commit 0d6ee26af9aa75777fccd81b00a853bc72f8bf76 Merge: e0311f6 3dfecff Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 7 16:39:15 2016 -0500 Merge branch 'maint-0.2.9' This is an "ours" merge to avoid taking the version bump.