commit 0f46f7d1ec8064ffc5573d60819fc7f231497e12 Merge: b928095 7b24f3e Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 7 08:39:39 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9