commit 5222054163e0233dfc2cf59de779b2f816bfeb63 Merge: 71cd68b e6376a8 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Feb 15 07:52:47 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8