commit 6e7ff9ee31c22bf804f711c6595de55ee2f28257 Merge: 3781f24 e778a41 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Feb 15 07:51:41 2017 -0500 Merge branch 'maint-0.2.6' of git-rw.torproject.org:/tor into maint-0.2.6