commit 23f1caf2af300c55a33b7cb3f1671b0b9c2f73f2 Merge: 65cda78 eca4a89 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 7 10:39:23 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9