Skip to content

Commit

Permalink
upgrade tor to v0.4.7.8
Browse files Browse the repository at this point in the history
  • Loading branch information
flatcloud0b3 committed Jun 20, 2022
1 parent afdef12 commit b2062f2
Show file tree
Hide file tree
Showing 234 changed files with 34,463 additions and 13,725 deletions.
1,038 changes: 1,021 additions & 17 deletions ChangeLog

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -864,10 +864,8 @@ RECURSIVE = YES
# run.

EXCLUDE = ./src/ext/ed25519 \
./src/ext/rust \
./src/trunnel \
./src/test \
./src/rust/registry
./src/test

# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
Expand Down
67 changes: 4 additions & 63 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@ else
TESTING_TOR_BINARY=$(top_builddir)/src/app/tor$(EXEEXT)
endif

if USE_RUST
rust_ldadd=$(top_builddir)/$(TOR_RUST_LIB_PATH)
else
rust_ldadd=
endif

# "Common" libraries used to link tor's utility code.
TOR_UTIL_LIBS = \
src/lib/libtor-geoip.a \
Expand Down Expand Up @@ -192,7 +186,7 @@ EXTRA_DIST+= \
INSTALL \
LICENSE \
Makefile.nmake \
README \
README.md \
ReleaseNotes \
scripts/build/combine_libs \
scripts/maint/checkIncludes.py \
Expand Down Expand Up @@ -253,7 +247,7 @@ endif
TEST_NETWORK_SHOW_WARNINGS_FOR_LAST_RUN_FLAGS=--quiet --only-warnings

if LIBFUZZER_ENABLED
TEST_CFLAGS += -fsanitize-coverage=trace-pc-guard,trace-cmp,trace-div
TEST_CFLAGS += -fsanitize=fuzzer-no-link
# not "edge"
endif

Expand Down Expand Up @@ -590,7 +584,7 @@ check-typos:
$(top_srcdir)/doc \
$(top_srcdir)/contrib \
$(top_srcdir)/scripts \
$(top_srcdir)/README \
$(top_srcdir)/README.md \
$(top_srcdir)/ChangeLog \
$(top_srcdir)/INSTALL \
$(top_srcdir)/ReleaseNotes \
Expand All @@ -601,51 +595,6 @@ check-typos:
echo "You can install the latest version of misspell here: https://github.com/client9/misspell#install"; \
fi

.PHONY: rustfmt
rustfmt:
if USE_RUST
@if test -x "`which cargo-fmt 2>&1;true`"; then \
echo "Formatting Rust code ..."; \
(cd "$(top_srcdir)/src/rust" && cargo fmt --all --); \
else \
echo "Tor uses rustfmt (via cargo-fmt) to format Rust code."; \
echo "However, it seems that you don't have rustfmt installed."; \
printf "You can install rustfmt by following the directions here:"; \
echo " https://github.com/rust-lang-nursery/rustfmt"; \
fi
endif

.PHONY: check-rustfmt
check-rustfmt:
if USE_RUST
@if test -x "`which cargo-fmt 2>&1;true`"; then \
printf "Running rustfmt..."; \
(cd "$(top_srcdir)/src/rust" && cargo fmt --all -- --check && echo "done.") || \
(echo "**************** check-rustfmt failed. ****************"; \
echo " Run \`make rustfmt\` to apply the above changes."; \
exit 1); \
else \
echo "Tor uses rustfmt (via cargo-fmt) to format Rust code."; \
echo "However, it seems that you don't have rustfmt installed."; \
printf "You can install rustfmt by following the directions here:"; \
echo " https://github.com/rust-lang-nursery/rustfmt"; \
fi
endif

.PHONY: clippy
clippy:
if USE_RUST
@if test -x "`which cargo-clippy 2>&1;true`"; then \
echo "Running cargo clippy ..."; \
echo "Prepare yourself for the onslaught of suggestions ..."; \
(cd "$(top_srcdir)/src/rust" && cargo clippy); \
else \
echo "Tor can use clippy to lint Rust code."; \
echo "However, it seems that you don't have clippy installed."; \
echo "You can install the latest version of clippy by following the directions here: https://github.com/rust-lang-nursery/rust-clippy"; \
fi
endif

.PHONY: check-changes
check-changes:
if USEPYTHON
Expand Down Expand Up @@ -686,22 +635,14 @@ update-copyright:
$(PERL) $(top_srcdir)/scripts/maint/updateCopyright.pl $(OWNED_TOR_C_FILES)

.PHONY: autostyle
autostyle: update-versions rustfmt autostyle-ifdefs rectify-includes
autostyle: update-versions autostyle-ifdefs rectify-includes

mostlyclean-local:
rm -f $(top_builddir)/src/*/*.gc{da,no} $(top_builddir)/src/*/*/*.gc{da,no}
rm -rf $(HTML_COVER_DIR)
rm -rf $(top_builddir)/doc/doxygen
rm -rf $(TEST_NETWORK_ALL_LOG_DIR)

clean-local:
rm -rf $(top_builddir)/src/rust/target
rm -rf $(top_builddir)/src/rust/.cargo/registry

if USE_RUST
distclean-local: distclean-rust
endif

# This relies on some internal details of how automake implements
# distcheck. We check two directories because automake-1.15 changed
# from $(distdir)/_build to $(distdir)/_build/sub.
Expand Down
Loading

0 comments on commit b2062f2

Please sign in to comment.