Commit 55055396 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.4.1' into bug33032_041

parents 5721ec22 5298113d

.appveyor.yml

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ test_script: 
            $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath

            $env:Path = $buildpath -join ';'

            Set-Location "${env:build}"

            Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll" -Destination "${env:build}/src/test"

            Copy-Item "C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/test"

            Execute-Bash "VERBOSE=1 make -k -j2 check"

    }

.gitignore

+12 −2
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ uptime-*.json 


# /src/lib

/src/lib/libcurve25519_donna.a

/src/lib/libtor-buf.a

/src/lib/libtor-buf-testing.a

/src/lib/libtor-compress.a

/src/lib/libtor-compress-testing.a

/src/lib/libtor-container.a
@@ -166,6 +168,8 @@ uptime-*.json 
/src/lib/libtor-crypt-ops-testing.a

/src/lib/libtor-ctime.a

/src/lib/libtor-ctime-testing.a

/src/lib/libtor-dispatch.a

/src/lib/libtor-dispatch-testing.a

/src/lib/libtor-encoding.a

/src/lib/libtor-encoding-testing.a

/src/lib/libtor-evloop.a
@@ -198,6 +202,8 @@ uptime-*.json 
/src/lib/libtor-osinfo-testing.a

/src/lib/libtor-process.a

/src/lib/libtor-process-testing.a

/src/lib/libtor-pubsub.a

/src/lib/libtor-pubsub-testing.a

/src/lib/libtor-sandbox.a

/src/lib/libtor-sandbox-testing.a

/src/lib/libtor-string.a
@@ -213,6 +219,8 @@ uptime-*.json 
/src/lib/libtor-tls.a

/src/lib/libtor-tls-testing.a

/src/lib/libtor-trace.a

/src/lib/libtor-version.a

/src/lib/libtor-version-testing.a

/src/lib/libtor-wallclock.a

/src/lib/libtor-wallclock-testing.a
@@ -240,20 +248,22 @@ uptime-*.json 
/src/test/test

/src/test/test-slow

/src/test/test-bt-cl

/src/test/test-child

/src/test/test-process

/src/test/test-memwipe

/src/test/test-ntor-cl

/src/test/test-hs-ntor-cl

/src/test/test-rng

/src/test/test-switch-id

/src/test/test-timers

/src/test/test_workqueue

/src/test/test.exe

/src/test/test-slow.exe

/src/test/test-bt-cl.exe

/src/test/test-child.exe

/src/test/test-process.exe

/src/test/test-ntor-cl.exe

/src/test/test-hs-ntor-cl.exe

/src/test/test-memwipe.exe

/src/test/test-rng.exe

/src/test/test-switch-id.exe

/src/test/test-timers.exe

/src/test/test_workqueue.exe

.travis.yml

+3 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ matrix: 
    - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"

      compiler: clang

    ## We include a single coverage build with the best options for coverage

    - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""

    - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" TOR_TEST_RNG_SEED="636f766572616765"

    ## We run rust on Linux, because it's faster than rust on macOS

    ## We check rust offline

    - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
@@ -114,6 +114,7 @@ addons: 
      - libscrypt-dev

      - libseccomp-dev

      - libzstd-dev

      - shellcheck

      ## Conditional build dependencies

      ## Always installed, so we don't need sudo

      - asciidoc
@@ -142,6 +143,7 @@ addons: 
      - pkg-config

      ## Optional build dependencies

      - ccache

      - shellcheck

      ## Conditional build dependencies

      ## Always installed, because manual brew installs are hard to get right

      - asciidoc

ChangeLog

+1933 −0

File changed.

Preview size limit exceeded, changes collapsed.

Makefile.am

+61 −12
Original line number Diff line number Diff line
@@ -31,9 +31,7 @@ TESTING_TOR_BINARY=$(top_builddir)/src/app/tor$(EXEEXT) 
endif



if USE_RUST

## this MUST be $(), otherwise am__DEPENDENCIES will not track it

rust_ldadd=$(top_builddir)/$(TOR_RUST_LIB_PATH) \

	$(TOR_RUST_EXTRA_LIBS)

rust_ldadd=$(top_builddir)/$(TOR_RUST_LIB_PATH)

else

rust_ldadd=

endif
@@ -42,6 +40,9 @@ endif 
TOR_UTIL_LIBS = \

        src/lib/libtor-geoip.a \

	src/lib/libtor-process.a \

        src/lib/libtor-buf.a \

	src/lib/libtor-pubsub.a \

	src/lib/libtor-dispatch.a \

	src/lib/libtor-time.a \

	src/lib/libtor-fs.a \

	src/lib/libtor-encoding.a \
@@ -62,6 +63,7 @@ TOR_UTIL_LIBS = \ 
	src/lib/libtor-malloc.a \

	src/lib/libtor-wallclock.a \

	src/lib/libtor-err.a \

	src/lib/libtor-version.a \

	src/lib/libtor-intmath.a \

	src/lib/libtor-ctime.a
@@ -71,6 +73,9 @@ if UNITTESTS_ENABLED 
TOR_UTIL_TESTING_LIBS = \

        src/lib/libtor-geoip-testing.a \

	src/lib/libtor-process-testing.a \

        src/lib/libtor-buf-testing.a \

	src/lib/libtor-pubsub-testing.a \

	src/lib/libtor-dispatch-testing.a \

	src/lib/libtor-time-testing.a \

	src/lib/libtor-fs-testing.a \

	src/lib/libtor-encoding-testing.a \
@@ -91,6 +96,7 @@ TOR_UTIL_TESTING_LIBS = \ 
	src/lib/libtor-malloc-testing.a \

	src/lib/libtor-wallclock-testing.a \

	src/lib/libtor-err-testing.a \

	src/lib/libtor-version-testing.a \

	src/lib/libtor-intmath.a \

	src/lib/libtor-ctime-testing.a

endif
@@ -159,7 +165,12 @@ EXTRA_DIST+= \ 
	README						\

	ReleaseNotes					\

	scripts/maint/checkIncludes.py                  \

	scripts/maint/checkSpace.pl

	scripts/maint/checkSpace.pl 			\

	scripts/maint/practracker/exceptions.txt	\

	scripts/maint/practracker/metrics.py		\

	scripts/maint/practracker/practracker.py	\

	scripts/maint/practracker/problem.py		\

	scripts/maint/practracker/util.py



## This tells etags how to find mockable function definitions.

AM_ETAGSFLAGS=--regex='{c}/MOCK_IMPL([^,]+,\W*\([a-zA-Z0-9_]+\)\W*,/\1/s'
@@ -213,7 +224,16 @@ doxygen: 
test: all

	$(top_builddir)/src/test/test



check-local: check-spaces check-changes check-includes

shellcheck:

        # Only use shellcheck if it is present

	if command -v shellcheck; then \

	        find $(top_srcdir)/scripts/ -name "*.sh" -exec shellcheck {} +; \

	        if [ -d "$(top_srcdir)/scripts/test" ]; then \

                        shellcheck $(top_srcdir)/scripts/test/cov-diff $(top_srcdir)/scripts/test/coverage; \

                fi; \

	fi



check-local: check-spaces check-changes check-includes shellcheck



need-chutney-path:

	@if test ! -d "$$CHUTNEY_PATH"; then \
@@ -317,11 +337,8 @@ coverage-html-full: all 
	lcov --remove "$(HTML_COVER_DIR)/lcov.tmp" --rc lcov_branch_coverage=1 'test/*' 'ext/tinytest*' '/usr/*' --output-file "$(HTML_COVER_DIR)/lcov.info"

	genhtml --branch-coverage -o "$(HTML_COVER_DIR)" "$(HTML_COVER_DIR)/lcov.info"



# Avoid strlcpy.c, strlcat.c, aes.c, OpenBSD_malloc_Linux.c, sha256.c,

# tinytest*.[ch]

check-spaces:

if USE_PERL

	$(PERL) $(top_srcdir)/scripts/maint/checkSpace.pl -C \

# For scripts: avoid src/ext and src/trunnel.

OWNED_TOR_C_FILES=\

		$(top_srcdir)/src/lib/*/*.[ch] \

		$(top_srcdir)/src/core/*/*.[ch] \

		$(top_srcdir)/src/feature/*/*.[ch] \
@@ -329,6 +346,11 @@ if USE_PERL 
		$(top_srcdir)/src/test/*.[ch] \

		$(top_srcdir)/src/test/*/*.[ch] \

		$(top_srcdir)/src/tools/*.[ch]



check-spaces:

if USE_PERL

	$(PERL) $(top_srcdir)/scripts/maint/checkSpace.pl -C \

		$(OWNED_TOR_C_FILES)

endif



check-includes:
@@ -336,6 +358,14 @@ if USEPYTHON 
	$(PYTHON) $(top_srcdir)/scripts/maint/checkIncludes.py

endif



check-best-practices:

if USEPYTHON

	$(PYTHON) $(top_srcdir)/scripts/maint/practracker/practracker.py $(top_srcdir)

endif



practracker-regen:

	$(PYTHON) $(top_srcdir)/scripts/maint/practracker/practracker.py --regen $(top_srcdir)



check-docs: all

	$(PERL) $(top_builddir)/scripts/maint/checkOptionDocs.pl
@@ -412,13 +442,13 @@ endif 
check-changes:

if USEPYTHON

	@if test -d "$(top_srcdir)/changes"; then \

		$(PYTHON) $(top_srcdir)/scripts/maint/lintChanges.py $(top_srcdir)/changes; \

		PACKAGE_VERSION=$(PACKAGE_VERSION) $(PYTHON) $(top_srcdir)/scripts/maint/lintChanges.py $(top_srcdir)/changes; \

		fi

endif



.PHONY: update-versions

update-versions:

	$(PERL) $(top_builddir)/scripts/maint/updateVersions.pl

	abs_top_srcdir="$(abs_top_srcdir)" $(PYTHON) $(top_srcdir)/scripts/maint/update_versions.py



.PHONY: callgraph

callgraph:
@@ -431,6 +461,25 @@ version: 
	   (cd "$(top_srcdir)" && git rev-parse --short=16 HEAD); \

	fi



.PHONY: autostyle-ifdefs

autostyle-ifdefs:

	$(PYTHON) scripts/maint/annotate_ifdef_directives $(OWNED_TOR_C_FILES)



.PHONY: autostyle-ifdefs

autostyle-operators:

	$(PERL) scripts/coccinelle/test-operator-cleanup $(OWNED_TOR_C_FILES)



.PHONY: rectify-includes

rectify-includes:

	$(PYTHON) scripts/maint/rectify_include_paths.py



.PHONY: update-copyright

update-copyright:

	$(PERL) scripts/maint/updateCopyright.pl $(OWNED_TOR_C_FILES)



.PHONY: autostyle

autostyle: update-versions rustfmt 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)