Merge 4c4b5663ab66828c2d9c5296c30042342a83eb44 into 9c83e0747111d4916… · Electron-Cash/Electron-Cash@60cc12f

Commit

Merge 4c4b566 into 9c83e07

Browse files

EchterAgo committed Mar 23, 2021

2 parents 9c83e07 + 4c4b566 commit 60cc12f

contrib/tor

Submodule tor updated 37 files

+143 −0		ChangeLog
+10 −33		LICENSE
+550 −0		ReleaseNotes
+3 −4		configure.ac
+1 −1		contrib/win32build/tor-mingw.nsi.in
+3 −2		doc/man/tor.1.txt
+1 −1		scripts/maint/practracker/exceptions.txt
+1 −0		src/app/config/config.c
+13 −1		src/app/config/resolve_addr.c
+0 −1		src/app/main/main.c
+45,759 −98,595		src/config/geoip
+49,481 −13,198		src/config/geoip6
+4 −0		src/core/mainloop/connection.c
+1 −1		src/core/or/protover.c
+1 −1		src/feature/dirauth/dirvote.c
+0 −8		src/feature/dirclient/dirclient_modes.c
+9 −0		src/feature/dirparse/unparseable.c
+5 −3		src/feature/hs/hs_metrics.c
+3 −1		src/feature/hs/hs_service.c
+27 −3		src/feature/metrics/metrics.c
+2 −0		src/feature/metrics/metrics.h
+8 −1		src/feature/nodelist/networkstatus.c
+63 −6		src/feature/relay/relay_config.c
+14 −24		src/feature/relay/relay_find_addr.c
+0 −2		src/feature/relay/relay_find_addr.h
+24 −16		src/feature/relay/router.c
+4 −0		src/feature/relay/selftest.c
+1 −0		src/lib/meminfo/.may_include
+2 −24		src/lib/meminfo/meminfo.c
+0 −1		src/lib/meminfo/meminfo.h
+2 −2		src/rust/protover/protover.rs
+20 −22		src/test/test_config.c
+27 −5		src/test/test_metrics.c
+0 −3		src/test/test_protover.c
+57 −3		src/test/test_switch_id.c
+0 −52		src/test/test_util.c
+1 −1		src/win32/orconfig.h

Please sign in to comment.