commit 9db7bd08f0a04133fcf4ee976d1b8f9a321de5a9 Merge: 9965059 ec19ecc Author: Nick Mathewson <nickm at torproject.org> Date: Fri Sep 23 15:58:40 2016 -0400 Merge branch 'maint-0.2.8'