commit 7b24f3e0fef04cdb21cd0b73ec4fde457702a81b Merge: c77ace6 eb72365 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 7 08:39:33 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8