commit b60fb3ab8b803b535a81296dbbf7d0c218a3dd27 Merge: 93ea18e 0a43134 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 7 09:20:45 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8