commit 3341ad1e9b4bd8a10e3598d051dfa3a6f8e7b941 Merge: d4c125b 490cd03 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Dec 20 18:24:09 2016 -0500 Merge branch 'maint-0.2.9'