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

[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

[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] 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/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] 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] 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] 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