- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Simplest fix to bug2402: do not include SVN versions
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit a1073ee956021ead19d30c2151510dbaced416a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 25 14:08:13 2011 -0500 Simplest fix to bug2402: do not include SVN versions When we stopped using svn, 0.2.1.x lost the ability to notice its svn revision and report it in the version number. However, it kept looking at the micro-revision.i file... so if you switched to master, built tor, then switched to 0.2.1.x, you'd get a micro-revision.i file from master reported as an SVN tag. This patch takes out the "include the svn tag" logic entirely. Bugfix on 0.2.1.15-rc; fixes bug 2402. --- changes/bug2402 | 4 ++++ src/or/config.c | 11 +---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/changes/bug2402 b/changes/bug2402 new file mode 100644 index 0000000..f16f677 --- /dev/null +++ b/changes/bug2402 @@ -0,0 +1,4 @@ + o Minor bugfixes (build) + - Do not include Git version tags as though they were SVN tags when + generating a tarball from inside a repository that has switched between + branches. Bugfix on 0.2.1.15-rc; fixes bug 2402. diff --git a/src/or/config.c b/src/or/config.c index f8cfd29..c5d6540 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -827,16 +827,7 @@ static char *_version = NULL; const char * get_version(void) { - if (_version == NULL) { - if (strlen(tor_svn_revision)) { - size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8; - _version = tor_malloc(len); - tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision); - } else { - _version = tor_strdup(VERSION); - } - } - return _version; + return VERSION; } /** Release additional memory allocated in options

1 0

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

22 Feb '11

commit 7605985b3ff71cee7fabdf023baf298b218d04c1 Merge: 372773d a1073ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 22 15:54:13 2011 -0500 Merge remote branch 'public/bug2402_nothing' into maint-0.2.1 changes/bug2402 | 4 ++++ src/or/config.c | 11 +---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --combined src/or/config.c index 8397b23,c5d6540..209a92d --- a/src/or/config.c +++ b/src/or/config.c @@@ -827,16 -827,7 +827,7 @@@ static char *_version = NULL const char * get_version(void) { - if (_version == NULL) { - if (strlen(tor_svn_revision)) { - size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8; - _version = tor_malloc(len); - tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision); - } else { - _version = tor_strdup(VERSION); - } - } - return _version; + return VERSION; } /** Release additional memory allocated in options @@@ -2878,9 -2869,7 +2869,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 @@@ -3370,11 -3359,6 +3361,11 @@@ options_validate(or_options_t *old_opti "RelayBandwidthBurst", 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) { r = tor_snprintf(buf, sizeof(buf), @@@ -3406,6 -3390,9 +3397,6 @@@ } } - if (options->RelayBandwidthRate && !options->RelayBandwidthBurst) - options->RelayBandwidthBurst = options->RelayBandwidthRate; - if (options->RelayBandwidthRate > options->RelayBandwidthBurst) REJECT("RelayBandwidthBurst must be at least equal " "to RelayBandwidthRate.");

1 0

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

22 Feb '11

commit e606f19fa369c7ad5934793cb4f72f97972b52bc 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/maint-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit 84cdcc68a944b31a0b138fcf5ac5e9074c27ed5a Merge: 4f730e4 7605985 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 22 15:57:36 2011 -0500 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 Use "ours" strategy" to avoid taking bug2402 fix.

1 0

[tor/maint-0.2.1] Merge remote branch 'public/bug2402_nothing' into maint-0.2.1
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit 7605985b3ff71cee7fabdf023baf298b218d04c1 Merge: 372773d a1073ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 22 15:54:13 2011 -0500 Merge remote branch 'public/bug2402_nothing' into maint-0.2.1 changes/bug2402 | 4 ++++ src/or/config.c | 11 +---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --combined src/or/config.c index 8397b23,c5d6540..209a92d --- a/src/or/config.c +++ b/src/or/config.c @@@ -827,16 -827,7 +827,7 @@@ static char *_version = NULL const char * get_version(void) { - if (_version == NULL) { - if (strlen(tor_svn_revision)) { - size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8; - _version = tor_malloc(len); - tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision); - } else { - _version = tor_strdup(VERSION); - } - } - return _version; + return VERSION; } /** Release additional memory allocated in options @@@ -2878,9 -2869,7 +2869,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 @@@ -3370,11 -3359,6 +3361,11 @@@ options_validate(or_options_t *old_opti "RelayBandwidthBurst", 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) { r = tor_snprintf(buf, sizeof(buf), @@@ -3406,6 -3390,9 +3397,6 @@@ } } - if (options->RelayBandwidthRate && !options->RelayBandwidthBurst) - options->RelayBandwidthBurst = options->RelayBandwidthRate; - if (options->RelayBandwidthRate > options->RelayBandwidthBurst) REJECT("RelayBandwidthBurst must be at least equal " "to RelayBandwidthRate.");

1 0

[tor/maint-0.2.1] Simplest fix to bug2402: do not include SVN versions
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit a1073ee956021ead19d30c2151510dbaced416a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 25 14:08:13 2011 -0500 Simplest fix to bug2402: do not include SVN versions When we stopped using svn, 0.2.1.x lost the ability to notice its svn revision and report it in the version number. However, it kept looking at the micro-revision.i file... so if you switched to master, built tor, then switched to 0.2.1.x, you'd get a micro-revision.i file from master reported as an SVN tag. This patch takes out the "include the svn tag" logic entirely. Bugfix on 0.2.1.15-rc; fixes bug 2402. --- changes/bug2402 | 4 ++++ src/or/config.c | 11 +---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/changes/bug2402 b/changes/bug2402 new file mode 100644 index 0000000..f16f677 --- /dev/null +++ b/changes/bug2402 @@ -0,0 +1,4 @@ + o Minor bugfixes (build) + - Do not include Git version tags as though they were SVN tags when + generating a tarball from inside a repository that has switched between + branches. Bugfix on 0.2.1.15-rc; fixes bug 2402. diff --git a/src/or/config.c b/src/or/config.c index f8cfd29..c5d6540 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -827,16 +827,7 @@ static char *_version = NULL; const char * get_version(void) { - if (_version == NULL) { - if (strlen(tor_svn_revision)) { - size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8; - _version = tor_malloc(len); - tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision); - } else { - _version = tor_strdup(VERSION); - } - } - return _version; + return VERSION; } /** Release additional memory allocated in options

1 0

[torsocks/master] Fix build on systems that export res_query a strange way
by hoganrobert＠torproject.org 22 Feb '11

22 Feb '11

commit 638e9bed2ce080ac081cc0a68778720ecd767a1b Author: Robert Hogan <robert(a)roberthogan.net> Date: Tue Feb 22 20:29:16 2011 +0000 Fix build on systems that export res_query a strange way Reported by starslights. --- configure.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 69d2efb..113b09b 100644 --- a/configure.in +++ b/configure.in @@ -519,7 +519,9 @@ AC_SUBST(SPECIALLIBS) LIBS=${SIMPLELIBS} AC_SEARCH_LIBS(dlopen, [dl]) -AC_SEARCH_LIBS(res_query, [resolv]) +# Required to compile on machines that export res_query with a double underscore. +# Sourced from gnupg configure via cvsnt. +AC_SEARCH_LIBS(res_query,resolv bind,,AC_SEARCH_LIBS(__res_query,resolv bind)) TESTLDFLAGS="$LDFLAGS"

1 0

r24254: {website} karen noticed we were duplicating the first "how tor works" (website/trunk/about/en)
by Roger Dingledine 22 Feb '11

22 Feb '11

Author: arma Date: 2011-02-22 20:08:33 +0000 (Tue, 22 Feb 2011) New Revision: 24254 Modified: website/trunk/about/en/overview.wml Log: karen noticed we were duplicating the first "how tor works" picture on our overview page. Modified: website/trunk/about/en/overview.wml =================================================================== --- website/trunk/about/en/overview.wml 2011-02-22 03:30:33 UTC (rev 24253) +++ website/trunk/about/en/overview.wml 2011-02-22 20:08:33 UTC (rev 24254) @@ -148,8 +148,6 @@ single point can tell where the data came from or where it's going. </p> - <p><img alt="Tor circuit step one" src="$(IMGROOT)/htw1.png"></p> - <p> To create a private network pathway with Tor, the user's software or client incrementally builds a circuit of encrypted connections through

1 0

[tor/release-0.2.1] fold in more changes files
by arma＠torproject.org 22 Feb '11

22 Feb '11

commit 6168d2e975a5712afe91a3b4ba9fba3bcee3a03a Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 22 15:00:07 2011 -0500 fold in more changes files --- ChangeLog | 10 ++++++++++ changes/bug1074-part2 | 6 ------ changes/torspec.git | 5 ----- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index dcbb6a3..869365c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ Changes in version 0.2.1.30 - 2011-02-?? o Major bugfixes: + - Stop sending a CLOCK_SKEW controller status event whenever + we fetch directory information from a relay that has a wrong clock. + Instead, only inform the controller when it's a trusted authority + that claims our clock is wrong. Bugfix on 0.1.2.6-alpha; fixes + the rest of bug 1074. - Fix a bounds-checking error that could allow an attacker to remotely crash a directory authority. Bugfix on 0.2.1.5-alpha. Found by "piebeer". @@ -21,6 +26,11 @@ Changes in version 0.2.1.30 - 2011-02-?? directory tokens before they have a chance to hit any assertions. Bugfix on 0.2.1.28. Found by "doorss". + 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 + Changes in version 0.2.1.29 - 2011-01-15 Tor 0.2.1.29 continues our recent code security audit work. The main diff --git a/changes/bug1074-part2 b/changes/bug1074-part2 deleted file mode 100644 index 6644f49..0000000 --- a/changes/bug1074-part2 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes: - - Stop sending a CLOCK_SKEW controller status event whenever - we fetch directory information from a relay that has a wrong clock. - Instead, only inform the controller when it's a trusted authority - that claims our clock is wrong. Bugfix on tor-0.1.2.6-alpha; - fixes the other half of bug 1074. diff --git a/changes/torspec.git b/changes/torspec.git deleted file mode 100644 index ba33ca2..0000000 --- a/changes/torspec.git +++ /dev/null @@ -1,5 +0,0 @@ - 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/release-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