commit 7e0da695e0f0485da1c91c1dd7a4919b273acf01 Merge: 81c06b1 7fb19f1 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Dec 10 10:05:29 2015 -0500 Merge branch 'maint-0.2.7'