commit 6eb1b4bd9cbf16339b30c2531dd1997291cc0d4c Merge: 8a0ea3e 0d0c7a1 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Dec 5 08:06:36 2016 -0500 Merge branch 'maint-0.2.9'