commit d015c70a118e43577a3821433970c4367cc8982f Merge: 9f6b9e2 aa40f28 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Dec 10 14:25:14 2015 -0500 Merge branch 'maint-0.2.7'