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

3 Feb 2021


      commit ff1b24fb73cb8b32fdf4d4121ed958286ae1dab2
Merge: 44b4aa82aa 2933c37188
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed Feb 3 13:39:41 2021 -0500

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

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

nickm＠torproject.org