[tor/master] Merge branch 'maint-0.2.8'

17 Oct 2016


      commit 6e823a27f114523c566b99a4deb3900764570954
Merge: 702c1dc b0f1241
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon Oct 17 16:32:31 2016 -0400

    Merge branch 'maint-0.2.8'
    
    "ours" commit to avoid bumping version.

nickm＠torproject.org

tags

participants (1)