commit da0d5ad9830b22983864660ca1c732627e119747 Merge: 54771bc 332543b Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 7 08:34:37 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6