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

16 Nov 2018


      commit 8af8ecabbe429503a4ff9d5510df610907c6e45a
Merge: c0e18d2f8 15e752e6b
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu Nov 15 16:55:42 2018 -0500

    Merge branch 'maint-0.3.4' into maint-0.3.5
    
    "ours" merge to avoid duplicating conflict resolution in merge of 24104

nickm＠torproject.org

tags

participants (1)