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

8 Jan 2019


      commit ae578981b6c43fbf9e13d0e74806ca6153edf7a9
Merge: d19951970 44edfa7ad
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon Jan 7 21:18:33 2019 -0500

    Merge branch 'maint-0.3.5'
    
    "ours" to avoid version bump

nickm＠torproject.org

tags

participants (1)