commit eb72365554451f5e129169bb1216a9610f7ff183 Merge: 8c91cbb 8936c50 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 7 08:39:25 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7