[tor/maint-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.8

1 Dec 2017


      commit 2e219291bee2d378344286ba091ba09527b07188
Merge: ba4a9cf0c 6bda6777c
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu Nov 30 12:21:36 2017 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.8
    
    "ours" to avoid version bump

nickm＠torproject.org

tags

participants (1)