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

[nickm@xxxxxxxxxxxxxx]

commit 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b
Merge: 2e7cbd7a9c 6c0f15500b
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jan 11 14:37:28 2021 -0500

    Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/40241                   | 4 ++++
 src/core/or/channeltls.c        | 3 ++-
 src/core/or/circuitlist.c       | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits