commit 3f295bbef1d0d2cc495a963b858d211a85498ba3 Merge: 5923418 30f0516 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Dec 5 10:07:09 2016 -0500 Merge branch 'maint-0.2.9'