commit 93ea18e918813ec5e30ac7dc02fc4b545397396e Merge: 7b24f3e 115cefd Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 7 08:55:28 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8