Public Git Hosting - tor.git/commit

commit	a22bfe04bcb106b14e2416e39dc9f43dc82eeba0
author	Nick Mathewson <nickm@torproject.org>
	Tue, 19 Jan 2021 17:45:07 +0000 (19 12:45 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Tue, 19 Jan 2021 17:45:07 +0000 (19 12:45 -0500)
tree	632a0aa411f829d9cd41363779c84158091ab755	tree \| snapshot (tar.gz zip)
parent	17eb6355320c414d83cbc3c1930ec54ae7cd1ea4	commit \| diff
parent	2d5b21598ea04b3beb59cb678d8b438b27c45ee1	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
src/lib/log/util_bug.h	diff1 \|	diff2 \|	blob \| history