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

Merge remote-tracking branch 'tor-gitlab/mr/62'

parents 11f1fe3a 60c436d1

.travis.yml

+2 −2
Original line number Diff line number Diff line
@@ -237,8 +237,8 @@ install: 
  - dd ibs=1 count=1024 if=/dev/urandom > ~/.torrc



script:

  # Skip test_rebind on macOS

  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi

  # Skip test_rebind and test_include on macOS

  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; export TOR_SKIP_TEST_INCLUDE=true; fi

  - ./autogen.sh

  - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules"

  - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\""

changes/feature25140

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor feature (configuration):

    - Allow the using wildcards (* and ?) with the %include option on 

      configuration files. Closes ticket 25140. Patch by Daniel Pinto.

configure.ac

+4 −1
Original line number Diff line number Diff line
@@ -866,6 +866,7 @@ dnl Where do you live, libevent? And how do we call you? 
if test "$bwin32" = "true"; then

  TOR_LIB_WS32=-lws2_32

  TOR_LIB_IPHLPAPI=-liphlpapi

  TOR_LIB_SHLWAPI=-lshlwapi

  # Some of the cargo-cults recommend -lwsock32 as well, but I don't

  # think it's actually necessary.

  TOR_LIB_GDI=-lgdi32
@@ -878,6 +879,7 @@ fi 
AC_SUBST(TOR_LIB_WS32)

AC_SUBST(TOR_LIB_GDI)

AC_SUBST(TOR_LIB_IPHLPAPI)

AC_SUBST(TOR_LIB_SHLWAPI)

AC_SUBST(TOR_LIB_USERENV)



tor_libevent_pkg_redhat="libevent"
@@ -1646,7 +1648,8 @@ AC_CHECK_HEADERS([errno.h \ 
		  sys/utime.h \

		  sys/wait.h \

		  syslog.h \

		  utime.h])

		  utime.h \

		  glob.h])



AC_CHECK_HEADERS(sys/param.h)

doc/man/tor.1.txt

+11 −3
Original line number Diff line number Diff line
@@ -211,14 +211,22 @@ backslash character (\) before the end of the line. Comments can be used in 
such multiline entries, but they must start at the beginning of a line.



Configuration options can be imported from files or folders using the %include

option with the value being a path. If the path is a file, the options from the

file will be parsed as if they were written where the %include option is. If

option with the value being a path. This path can have wildcards. Wildcards are 

expanded first, then sorted using lexical order. Then, for each matching file or 

folder, the following rules are followed: if the path is a file, the options from 

the file will be parsed as if they were written where the %include option is. If

the path is a folder, all files on that folder will be parsed following lexical

order. Files starting with a dot are ignored. Files on subfolders are ignored.

order. Files starting with a dot are ignored. Files in subfolders are ignored.

The %include option can be used recursively.

New configuration files or directories cannot be added to already running Tor

instance if **Sandbox** is enabled.



The supported wildcards are * meaning any number of characters including none

and ? meaning exactly one character. These characters can be escaped by preceding

them with a backslash, except on Windows. Files starting with a dot are not matched

when expanding wildcards unless the starting dot is explicitly in the pattern, except

on Windows.



By default, an option on the command line overrides an option found in the

configuration file, and an option in a configuration file overrides one in

the defaults file.

scripts/codegen/fuzzing_include_am.py

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ FUZZING_LIBS = \ 
	$(rust_ldadd) \

	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \

	@TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) \

	@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ \

	@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ \

	@TOR_SYSTEMD_LIBS@ \

	@TOR_LZMA_LIBS@ \

	@TOR_ZSTD_LIBS@