[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.6

7 Feb 2017


      commit da0d5ad9830b22983864660ca1c732627e119747
Merge: 54771bc 332543b
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue Feb 7 08:34:37 2017 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.6

[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.6

nickm＠torproject.org