commit 1ba52d044dc4418fefe29ac205bbb7cac94e2df6 Merge: 8553849 5d4ff91 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Dec 8 09:06:49 2016 -0500 Merge branch 'maint-0.2.9'