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

25 Oct 2017


      commit faf568fa7e8cfbebc236b6aef743251b7e6b9df4
Merge: 9969b0dfd 82f8b27ff
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed Oct 25 09:28:15 2017 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.8
    
    "ours" merge to avoid version bump

nickm＠torproject.org

tags

participants (1)