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

11 Dec 2017


      commit 8e100d1a17d497d99c10c13db53442ff9e56063f
Merge: 5c03bb7c0 c55a05423
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon Dec 11 16:43:24 2017 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1
    
    "ours" merge to avoid taking the 030 version of 23862.

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

nickm＠torproject.org