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

8 Jun 2017


      commit d389480da54dfff4900b5ddf8c0795a02672bafe
Merge: a0664fd 8239af0
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu Jun 8 09:29:23 2017 -0400

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

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

nickm＠torproject.org