GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit 63d71cc4 authored by juga  's avatar juga

Merge branch 'maint-1.1'

parents b9c67d4e daaa5f3a
Pipeline #3382 failed with stage
in 3 minutes and 9 seconds
......@@ -88,7 +88,7 @@ System physical requirements
- Free disk: at least 3GB
``sbws`` and its dependencies need around 20MB of disk space.
After 90 days ``sbws`` data files use around 3GB.
After 57 days ``sbws`` data files use a maximum of 3GB.
If ``sbws`` is configured to log to files (by default will log to the
system log), it will need a maximum of 500MB.
......@@ -98,9 +98,10 @@ and log partitions.
Details about ``sbws`` data:
``sbws`` produces around 100MB of data a day.
By default raw results' files are compressed after 10 days and deleted after 90.
By default raw results' files are compressed after 29 days and deleted after
57.
The bandwidth files are compressed after 7 days and deleted after 1.
After 90 days, the disk space used by the data will be aproximately 3GB.
After 57 days, the disk space used by the data will be up to 3GB.
It will not increase further.
If ``sbws`` is configured to log to files, logs will be rotated after they
are 10MB and it will keep 50 rotated log files.
......
......@@ -9,6 +9,7 @@ connection to an existing Tor daemon.
Default configuration:
- ``SocksPort auto``: To proxy requests over Tor.
- ``CookieAuthentication 1``: The easiest way to authenticate to Tor.
- ``UseEntryGuards 0``: To avoid path bias warnings.
- ``UseMicrodescriptors 0``: Because full server descriptors are needed.
......
......@@ -346,11 +346,15 @@ def measure_relay(args, conf, destinations, cb, rl, relay):
# Instead of ensuring that the relay can exit to all IPs, try first with
# the relay as an exit, if it can exit to some IPs.
if relay.is_exit_not_bad_allowing_port(dest.port):
circ_fps, nicknames, exit_policy = \
create_path_relay(relay, dest, rl, cb, relay_as_entry=False)
r = create_path_relay(relay, dest, rl, cb, relay_as_entry=False)
else:
circ_fps, nicknames, exit_policy = \
create_path_relay(relay, dest, rl, cb)
r = create_path_relay(relay, dest, rl, cb)
# When `error_no_helper` is triggered because a helper is not found, what
# can happen in test networks with very few relays, it returns a list with
# the error.
if len(r) == 1:
return r
circ_fps, nicknames, exit_policy = r
# Build the circuit
circ_id, reason = cb.build_circuit(circ_fps)
......@@ -378,8 +382,10 @@ def measure_relay(args, conf, destinations, cb, rl, relay):
" to connect to %s via circuit %s (%s). Reason: %s. Trying again "
"with it as entry.", relay.fingerprint, relay.nickname,
exit_policy, dest.url, circ_fps, nicknames, usable_data)
circ_fps, nicknames, exit_policy = \
create_path_relay(relay, dest, rl, cb)
r = create_path_relay(relay, dest, rl, cb)
if len(r) == 1:
return r
circ_fps, nicknames, exit_policy = r
circ_id, reason = cb.build_circuit(circ_fps)
if not circ_id:
log.warning(
......
......@@ -22,6 +22,9 @@ SPEC_VERSION = '1.5.0'
# Options that are known at runtime (from configuration file) are added
# in utils/stem.py launch_tor
TORRC_STARTING_POINT = {
# We will find out via the ControlPort and not setting something static
# means a lower chance of conflict
'SocksPort': 'auto',
# Easier than password authentication
'CookieAuthentication': '1',
# To avoid path bias warnings
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment