commit 1fbff411b2f19da34b5d8021e6680dba42dcbb9e Merge: 76d79d5 a1c3b39 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Feb 15 07:53:01 2017 -0500 Merge branch 'maint-0.2.9'