[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

7 Sep 2018


      commit cff7cb858b2dfaacb0138bbe4637a80b58147f6a
Merge: 43e400f34 36885f34f
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri Sep 7 15:12:09 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3
    
    "ours" to avoid bump

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

nickm＠torproject.org