nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.3'

Browse Source
This commit is contained in:
Nick Mathewson 2018-04-05 08:21:43 -04:00
commit 43f3155582
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug25582 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (documentation):
- Revert a misformatting issue in the ExitPolicy
documentation. Fixes bug 25582; bugfix on 0.3.3.1-alpha.

4
changes/bug25679 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (compilation, rust):
- Build correctly when the rust dependencies submodule is loaded,
but the TOR_RUST_DEPENDENCIES environment variable is not set.
Fixes bug 25679; bugfix on 0.3.3.1-alpha.

12
configure.ac
View File

@ -446,23 +446,23 @@ if test "x$enable_rust" = "xyes"; then
AC_MSG_CHECKING([rust crate dependencies]) AC_MSG_CHECKING([rust crate dependencies])
AC_ARG_VAR([TOR_RUST_DEPENDENCIES], [path to directory with local crate mirror]) AC_ARG_VAR([TOR_RUST_DEPENDENCIES], [path to directory with local crate mirror])
if test "x$TOR_RUST_DEPENDENCIES" = "x"; then if test "x$TOR_RUST_DEPENDENCIES" = "x"; then
TOR_RUST_DEPENDENCIES="$srcdir/src/ext/rust/" TOR_RUST_DEPENDENCIES="${srcdir}/src/ext/rust/crates"
NEED_MOD=1
fi fi
dnl Check whether the path exists before we try to cd into it.
if test ! -d "$TOR_RUST_DEPENDENCIES"; then if test ! -d "$TOR_RUST_DEPENDENCIES"; then
AC_MSG_ERROR([Rust dependency directory $TOR_RUST_DEPENDENCIES does not exist. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.]) AC_MSG_ERROR([Rust dependency directory $TOR_RUST_DEPENDENCIES does not exist. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.])
ERRORED=1 ERRORED=1
fi fi
dnl Make the path absolute, since we'll be using it from within a
dnl subdirectory.
TOR_RUST_DEPENDENCIES=$(cd "$TOR_RUST_DEPENDENCIES" ; pwd)
for dep in $rust_crates; do for dep in $rust_crates; do
if test ! -d "$TOR_RUST_DEPENDENCIES"/"$dep"; then if test ! -d "$TOR_RUST_DEPENDENCIES"/"$dep"; then
AC_MSG_ERROR([Failure to find rust dependency $TOR_RUST_DEPENDENCIES/$dep. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.]) AC_MSG_ERROR([Failure to find rust dependency $TOR_RUST_DEPENDENCIES/$dep. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.])
ERRORED=1 ERRORED=1
fi fi
done done
if test "x$NEED_MOD" = "x1"; then
dnl When looking for dependencies from cargo, pick right directory
TOR_RUST_DEPENDENCIES="../../src/ext/rust"
fi
if test "x$ERRORED" = "x"; then if test "x$ERRORED" = "x"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
fi fi

6
doc/tor.1.txt
View File

@ -1203,6 +1203,7 @@ The following options are useful only for clients (that is, if
on different SocksPorts, TransPorts, etc are always isolated from one on different SocksPorts, TransPorts, etc are always isolated from one
another. This option overrides that behavior.) another. This option overrides that behavior.)
// Anchor only for formatting, not visible in the man page.
[[OtherSocksPortFlags]]:: [[OtherSocksPortFlags]]::
Other recognized __flags__ for a SocksPort are: Other recognized __flags__ for a SocksPort are:
**NoIPv4Traffic**;; **NoIPv4Traffic**;;
@ -1267,6 +1268,7 @@ The following options are useful only for clients (that is, if
authentication" when IsolateSOCKSAuth is disabled, or when this authentication" when IsolateSOCKSAuth is disabled, or when this
option is set. option is set.
// Anchor only for formatting, not visible in the man page.
[[SocksPortFlagsMisc]]:: [[SocksPortFlagsMisc]]::
Flags are processed left to right. If flags conflict, the last flag on the Flags are processed left to right. If flags conflict, the last flag on the
line is used, and all earlier flags are ignored. No error is issued for line is used, and all earlier flags are ignored. No error is issued for
@ -1904,7 +1906,8 @@ is non-zero):
reject *:6881-6999 reject *:6881-6999
accept *:* accept *:*
[[ExitPolicyDefault]] **ExitPolicyDefault**:: // Anchor only for formatting, not visible in the man page.
[[ExitPolicyDefault]]::
Since the default exit policy uses accept/reject *, it applies to both Since the default exit policy uses accept/reject *, it applies to both
IPv4 and IPv6 addresses. IPv4 and IPv6 addresses.
@ -2079,6 +2082,7 @@ is non-zero):
If the address is absent, or resolves to both an IPv4 and an IPv6 If the address is absent, or resolves to both an IPv4 and an IPv6
address, only listen to the IPv6 address. address, only listen to the IPv6 address.
// Anchor only for formatting, not visible in the man page.
[[ORPortFlagsExclusive]]:: [[ORPortFlagsExclusive]]::
For obvious reasons, NoAdvertise and NoListen are mutually exclusive, and For obvious reasons, NoAdvertise and NoListen are mutually exclusive, and
IPv4Only and IPv6Only are mutually exclusive. IPv4Only and IPv6Only are mutually exclusive.