[tor-commits] [tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

16 Aug 2021


      commit 1667e122def480fac8033fb96057971969a446d5
Merge: ca249131b0 2984fba97a
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon Aug 16 08:18:09 2021 -0400

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

[tor-commits] [tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

nickm＠torproject.org