February 2011 - tor-commits - lists.torproject.org

[githax/master] Add pootle to authors.txt
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit 60ea3b5c7615bc71b31355b94d33c242eba02788 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Feb 22 11:17:01 2011 +0100 Add pootle to authors.txt --- authors.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/authors.txt b/authors.txt index 3e28fa5..7286321 100644 --- a/authors.txt +++ b/authors.txt @@ -22,6 +22,7 @@ moxie = Moxie Marlinspike <moxie(a)thoughtcrime.org> nickm = Nick Mathewson <nickm(a)torproject.org> pde = Peter Eckersley <pde(a)eff.org> phobos = Andrew Lewman <andrew(a)torproject.org> +pootle = translation bot <tor-translation(a)torproject.org> sah = Steven Hazel <sah(a)freehaven.net> sebastian = Sebastian Hahn <sebastian(a)torproject.org> sjm217 = Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> @@ -49,7 +50,6 @@ weasel = Peter Palfrader <peter(a)palfrader.org> # kloesing # le # mfr -# pootle # qbi # renner # ruben

1 0

[tor/master] changes file for removing torspec from the tarball
by nickm＠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] Merge remote branch 'origin/maint-0.2.2'
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit 3d4c2ffa30e75b25f1fc1bacbc224ce8b69b68ba Merge: 108f48d e606f19 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 22 15:58:50 2011 -0500 Merge remote branch 'origin/maint-0.2.2' changes/torspec.git | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)

1 0

[tor/master] 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/master] 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/master] 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/master] 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] changes file for removing torspec from the tarball
by nickm＠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/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.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