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

28 Feb 2017


      commit 4128a8cabdb530fcbe1dda5a21887d7728e4d752
Merge: 3a60214 b049a5b
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue Feb 28 10:39:29 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0
    
    This is an "ours" merge to avoid a version bump.

nickm＠torproject.org

tags

participants (1)