- tor-commits - lists.torproject.org

[tor/maint-0.2.1] changes file for removing torspec from the tarball
by arma＠torproject.org 22 Feb '11

22 Feb '11

commit 372773d681ed0f67e824cf2eef41a7186ab6c458 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 22 14:50:00 2011 -0500 changes file for removing torspec from the tarball --- changes/torspec.git | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/torspec.git b/changes/torspec.git new file mode 100644 index 0000000..ba33ca2 --- /dev/null +++ b/changes/torspec.git @@ -0,0 +1,5 @@ + o Packaging changes: + - Stop shipping the Tor specs files and development proposal documents + in the tarball. They are now in a separate git repository at + git://git.torproject.org/torspec.git +

1 0

[tor/master] prefer https urls
by arma＠torproject.org 22 Feb '11

22 Feb '11

commit 0ab62a4dc531e9f13967aa93bf4dc1925cd69f03 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 22 14:39:09 2011 -0500 prefer https urls --- doc/spec/README | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/spec/README b/doc/spec/README index a7fa170..ccd33a4 100644 --- a/doc/spec/README +++ b/doc/spec/README @@ -1,10 +1,11 @@ The Tor specifications and proposals have moved to a new repository. -To browse the specifications, go to +To browse the specifications, go to https://gitweb.torproject.org/torspec.git/tree To check out the specification repository, run git clone git://git.torproject.org/torspec.git For other information on the repository, see - http://gitweb.torproject.org/torspec.git + https://gitweb.torproject.org/torspec.git +

1 0

[tor/master] Merge branch 'maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 22 Feb '11

22 Feb '11

commit 4f730e4f3f39748e214470357e3d7aff407fe7e0 Merge: cdc59c1 0ab62a4 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 22 14:44:09 2011 -0500 Merge branch 'maint-0.2.1' into maint-0.2.2 doc/spec/README | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 22 Feb '11

22 Feb '11

commit 108f48dfc7f1b6bdace9b859e01dbab79aeff071 Merge: 2eadbd4 4f730e4 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 22 14:44:32 2011 -0500 Merge branch 'maint-0.2.2' doc/spec/README | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.2] prefer https urls
by arma＠torproject.org 22 Feb '11

22 Feb '11

commit 0ab62a4dc531e9f13967aa93bf4dc1925cd69f03 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 22 14:39:09 2011 -0500 prefer https urls --- doc/spec/README | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/spec/README b/doc/spec/README index a7fa170..ccd33a4 100644 --- a/doc/spec/README +++ b/doc/spec/README @@ -1,10 +1,11 @@ The Tor specifications and proposals have moved to a new repository. -To browse the specifications, go to +To browse the specifications, go to https://gitweb.torproject.org/torspec.git/tree To check out the specification repository, run git clone git://git.torproject.org/torspec.git For other information on the repository, see - http://gitweb.torproject.org/torspec.git + https://gitweb.torproject.org/torspec.git +

1 0

[tor/maint-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 22 Feb '11

22 Feb '11

commit 4f730e4f3f39748e214470357e3d7aff407fe7e0 Merge: cdc59c1 0ab62a4 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 22 14:44:09 2011 -0500 Merge branch 'maint-0.2.1' into maint-0.2.2 doc/spec/README | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.1] prefer https urls
by arma＠torproject.org 22 Feb '11

22 Feb '11

commit 0ab62a4dc531e9f13967aa93bf4dc1925cd69f03 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 22 14:39:09 2011 -0500 prefer https urls --- doc/spec/README | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/spec/README b/doc/spec/README index a7fa170..ccd33a4 100644 --- a/doc/spec/README +++ b/doc/spec/README @@ -1,10 +1,11 @@ The Tor specifications and proposals have moved to a new repository. -To browse the specifications, go to +To browse the specifications, go to https://gitweb.torproject.org/torspec.git/tree To check out the specification repository, run git clone git://git.torproject.org/torspec.git For other information on the repository, see - http://gitweb.torproject.org/torspec.git + https://gitweb.torproject.org/torspec.git +

1 0

[torsocks/master] Replace Makefile.cvs with autogen.sh
by hoganrobert＠torproject.org 22 Feb '11

22 Feb '11

commit 3205b8fd332024bb693df84af6511a804b39bb4a Author: Robert Hogan <robert(a)roberthogan.net> Date: Tue Feb 22 19:13:09 2011 +0000 Replace Makefile.cvs with autogen.sh There, that wasn't so hard - was it. Autogen.sh stolen from tor. --- Makefile.cvs | 8 -------- autogen.sh | 13 +++++++++++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Makefile.cvs b/Makefile.cvs deleted file mode 100644 index d160702..0000000 --- a/Makefile.cvs +++ /dev/null @@ -1,8 +0,0 @@ -default: all - -all: - aclocal - autoheader - automake - autoconf - diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..0592f16 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +if [ -x "`which autoreconf 2>/dev/null`" ] ; then + exec autoreconf -ivf +fi + +set -e + +# Run this to generate all the initial makefiles, etc. +aclocal && \ + autoheader && \ + autoconf && \ + automake --add-missing --copy

1 0

[tor/master] Merge remote branch 'sebastian/bug2496'
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit 2eadbd41f0d0356898c75d7fab032109a85bc9e9 Merge: b7f201f 7736f44 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 22 14:17:11 2011 -0500 Merge remote branch 'sebastian/bug2496' src/or/config.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --combined src/or/config.c index 97a2b32,1dc042d..aa4d974 --- a/src/or/config.c +++ b/src/or/config.c @@@ -197,7 -197,6 +197,7 @@@ static config_var_t _option_vars[] = V(CircuitStreamTimeout, INTERVAL, "0"), V(CircuitPriorityHalflife, DOUBLE, "-100.0"), /*negative:'Use default'*/ V(ClientDNSRejectInternalAddresses, BOOL,"1"), + V(ClientRejectInternalAddresses, BOOL, "1"), V(ClientOnly, BOOL, "0"), V(ConsensusParams, STRING, NULL), V(ConnLimit, UINT, "1000"), @@@ -267,7 -266,6 +267,7 @@@ #endif OBSOLETE("Group"), V(HardwareAccel, BOOL, "0"), + V(HeartbeatPeriod, INTERVAL, "6 hours"), V(AccelName, STRING, NULL), V(AccelDir, FILENAME, NULL), V(HashedControlPassword, LINELIST, NULL), @@@ -293,7 -291,6 +293,7 @@@ OBSOLETE("IgnoreVersion"), V(KeepalivePeriod, INTERVAL, "5 minutes"), VAR("Log", LINELIST, Logs, NULL), + V(LogMessageDomains, BOOL, "0"), OBSOLETE("LinkPadding"), OBSOLETE("LogLevel"), OBSOLETE("LogFile"), @@@ -416,7 -413,6 +416,7 @@@ static config_var_t testing_tor_network V(AuthDirMaxServersPerAddr, UINT, "0"), V(AuthDirMaxServersPerAuthAddr,UINT, "0"), V(ClientDNSRejectInternalAddresses, BOOL,"0"), + V(ClientRejectInternalAddresses, BOOL, "0"), V(ExitPolicyRejectPrivate, BOOL, "0"), V(V3AuthVotingInterval, INTERVAL, "5 minutes"), V(V3AuthVoteDelay, INTERVAL, "20 seconds"), @@@ -1390,10 -1386,12 +1390,12 @@@ options_act(or_options_t *old_options print_notice = 1; } else { options->DirReqStatistics = 0; - log_notice(LD_CONFIG, "Configured to measure directory request " - "statistics, but no GeoIP database found! " - "Please specify a GeoIP database using the " - "GeoIPFile option!"); + /* Don't warn Tor clients, they don't use statistics */ + if (options->ORPort) + log_notice(LD_CONFIG, "Configured to measure directory request " + "statistics, but no GeoIP database found. " + "Please specify a GeoIP database using the " + "GeoIPFile option."); } } if ((!old_options || !old_options->EntryStatistics) && @@@ -1404,9 -1402,9 +1406,9 @@@ } else { options->EntryStatistics = 0; log_notice(LD_CONFIG, "Configured to measure entry node " - "statistics, but no GeoIP database found! " + "statistics, but no GeoIP database found. " "Please specify a GeoIP database using the " - "GeoIPFile option!"); + "GeoIPFile option."); } } if ((!old_options || !old_options->ExitPortStatistics) && @@@ -2891,9 -2889,7 +2893,9 @@@ compute_publishserverdescriptor(or_opti else if (!strcasecmp(string, "bridge")) *auth |= BRIDGE_AUTHORITY; else if (!strcasecmp(string, "hidserv")) - *auth |= HIDSERV_AUTHORITY; + log_warn(LD_CONFIG, + "PublishServerDescriptor hidserv is invalid. See " + "PublishHidServDescriptors."); else if (!strcasecmp(string, "") || !strcmp(string, "0")) /* no authority */; else @@@ -2917,10 -2913,6 +2919,10 @@@ * will generate too many circuits and potentially overload the network. */ #define MIN_CIRCUIT_STREAM_TIMEOUT 10 +/** Lowest allowable value for HeartbeatPeriod; if this is too low, we might + * expose more information than we're comfortable with. */ +#define MIN_HEARTBEAT_PERIOD (30*60) + /** Return 0 if every setting in <b>options</b> is reasonable, and a * permissible transition from <b>old_options</b>. Else return -1. * Should have no side effects, except for normalizing the contents of @@@ -3383,13 -3375,6 +3385,13 @@@ options_validate(or_options_t *old_opti options->CircuitStreamTimeout = MIN_CIRCUIT_STREAM_TIMEOUT; } + if (options->HeartbeatPeriod && + options->HeartbeatPeriod < MIN_HEARTBEAT_PERIOD) { + log_warn(LD_CONFIG, "HeartbeatPeriod option is too short; " + "raising to %d seconds.", MIN_HEARTBEAT_PERIOD); + options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD; + } + if (options->KeepalivePeriod < 1) REJECT("KeepalivePeriod option must be positive."); @@@ -3415,11 -3400,6 +3417,11 @@@ "PerConnBWBurst", msg) < 0) return -1; + if (options->RelayBandwidthRate && !options->RelayBandwidthBurst) + options->RelayBandwidthBurst = options->RelayBandwidthRate; + if (options->RelayBandwidthBurst && !options->RelayBandwidthRate) + options->RelayBandwidthRate = options->RelayBandwidthBurst; + if (server_mode(options)) { if (options->BandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) { tor_asprintf(msg, @@@ -3448,6 -3428,9 +3450,6 @@@ } } - if (options->RelayBandwidthRate && !options->RelayBandwidthBurst) - options->RelayBandwidthBurst = options->RelayBandwidthRate; - if (options->RelayBandwidthRate > options->RelayBandwidthBurst) REJECT("RelayBandwidthBurst must be at least equal " "to RelayBandwidthRate."); @@@ -3889,8 -3872,7 +3891,8 @@@ options_transition_affects_workers(or_o old_options->SafeLogging != new_options->SafeLogging || old_options->ClientOnly != new_options->ClientOnly || public_server_mode(old_options) != public_server_mode(new_options) || - !config_lines_eq(old_options->Logs, new_options->Logs)) + !config_lines_eq(old_options->Logs, new_options->Logs) || + old_options->LogMessageDomains != new_options->LogMessageDomains) return 1; /* Check whether log options match. */ @@@ -4107,8 -4089,6 +4109,8 @@@ load_torrc_from_disk(int argc, char **a "Unable to open configuration file \"%s\".", fname); goto err; } + } else { + log(LOG_NOTICE, LD_CONFIG, "Read configuration file \"%s\".", fname); } return cf; @@@ -4497,9 -4477,6 +4499,9 @@@ options_init_logs(or_options_t *options } smartlist_free(elts); + if (ok && !validate_only) + logs_set_domain_logging(options->LogMessageDomains); + return ok?0:-1; }

1 0

[tor/master] Don't tell Tor client users about missing geoip
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit 7736f44698798111be413ca3285a77ce1e4d6b0c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Feb 6 00:25:33 2011 +0100 Don't tell Tor client users about missing geoip They don't need the geoip file for stats, so a missing geoipfile is not a big issue. Also make the log message a bit friendlier. Fixes bug 2496. --- src/or/config.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 1fa8466..1dc042d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1386,10 +1386,12 @@ options_act(or_options_t *old_options) print_notice = 1; } else { options->DirReqStatistics = 0; - log_notice(LD_CONFIG, "Configured to measure directory request " - "statistics, but no GeoIP database found! " - "Please specify a GeoIP database using the " - "GeoIPFile option!"); + /* Don't warn Tor clients, they don't use statistics */ + if (options->ORPort) + log_notice(LD_CONFIG, "Configured to measure directory request " + "statistics, but no GeoIP database found. " + "Please specify a GeoIP database using the " + "GeoIPFile option."); } } if ((!old_options || !old_options->EntryStatistics) && @@ -1400,9 +1402,9 @@ options_act(or_options_t *old_options) } else { options->EntryStatistics = 0; log_notice(LD_CONFIG, "Configured to measure entry node " - "statistics, but no GeoIP database found! " + "statistics, but no GeoIP database found. " "Please specify a GeoIP database using the " - "GeoIPFile option!"); + "GeoIPFile option."); } } if ((!old_options || !old_options->ExitPortStatistics) &&

1 0