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

28 Feb 2017


      commit ccdf0b319cf83bb7dde3b3c18044ee5ea99a60ac
Merge: f7ed4a7 884b371
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue Feb 28 10:25:51 2017 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.6
    
    "ours" merge to avoid version bumps

nickm＠torproject.org

tags

participants (1)