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

15 Feb 2017


      commit a8a1e7e8da0903460a170c65f2709932cc3d98f7
Merge: c0ff59f aeb299b
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed Feb 15 07:53:05 2017 -0500

    Merge branch 'maint-0.2.5' into release-0.2.5

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

nickm＠torproject.org