Public Git Hosting - tor.git/commit

commit	4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b
author	Nick Mathewson <nickm@torproject.org>
	Mon, 11 Jan 2021 19:37:28 +0000 (11 14:37 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Mon, 11 Jan 2021 19:37:28 +0000 (11 14:37 -0500)
tree	1b02a2c4b14d2145039a841006d64e95f1c78dd2	tree \| snapshot (tar.gz zip)
parent	2e7cbd7a9c4672d334a5900be2d2f4be26e603a3	commit \| diff
parent	6c0f15500b3aa027c90d1c397d4504bb2f4dd41b	commit \| diff

Merge branch 'maint-0.3.5' into maint-0.4.3

The Onion Router

src/core/or/channeltls.c	diff1 \|	diff2 \|	blob \| history
src/core/or/circuitlist.c	diff1 \|	diff2 \|	blob \| history
src/feature/client/entrynodes.c	diff1 \|	diff2 \|	blob \| history
src/feature/rend/rendclient.c	diff1 \|	diff2 \|	blob \| history