commit 43f31555827319077858fb3872c28764961b944a
parent 52846f728d92b44cda1a7cab1bfa53b2450a29b9
Author: Nick Mathewson <nickm@torproject.org>
Date: Thu, 5 Apr 2018 08:21:43 -0400
Merge branch 'maint-0.3.3'
Diffstat:
4 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/changes/bug25582 b/changes/bug25582
@@ -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.
diff --git a/changes/bug25679 b/changes/bug25679
@@ -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.
diff --git a/configure.ac b/configure.ac
@@ -446,23 +446,23 @@ if test "x$enable_rust" = "xyes"; then
AC_MSG_CHECKING([rust crate dependencies])
AC_ARG_VAR([TOR_RUST_DEPENDENCIES], [path to directory with local crate mirror])
if test "x$TOR_RUST_DEPENDENCIES" = "x"; then
- TOR_RUST_DEPENDENCIES="$srcdir/src/ext/rust/"
- NEED_MOD=1
+ TOR_RUST_DEPENDENCIES="${srcdir}/src/ext/rust/crates"
fi
+ dnl Check whether the path exists before we try to cd into it.
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.])
ERRORED=1
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
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.])
ERRORED=1
fi
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
AC_MSG_RESULT([yes])
fi
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
@@ -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
another. This option overrides that behavior.)
+// Anchor only for formatting, not visible in the man page.
[[OtherSocksPortFlags]]::
Other recognized __flags__ for a SocksPort are:
**NoIPv4Traffic**;;
@@ -1267,6 +1268,7 @@ The following options are useful only for clients (that is, if
authentication" when IsolateSOCKSAuth is disabled, or when this
option is set.
+// Anchor only for formatting, not visible in the man page.
[[SocksPortFlagsMisc]]::
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
@@ -1904,7 +1906,8 @@ is non-zero):
reject *:6881-6999
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
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
address, only listen to the IPv6 address.
+// Anchor only for formatting, not visible in the man page.
[[ORPortFlagsExclusive]]::
For obvious reasons, NoAdvertise and NoListen are mutually exclusive, and
IPv4Only and IPv6Only are mutually exclusive.
