- tor-commits - lists.torproject.org

[tor/maint-0.2.1] Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1
by nickm＠torproject.org 06 Apr '11

06 Apr '11

commit 32341ac467d5fe51fa674eed4ca20db61ff5486b Merge: 0cdd262 02d93ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 6 16:13:22 2011 -0400 Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1 changes/bug2402 | 4 --- changes/bug2402_redux | 6 +++++ src/or/Makefile.am | 60 ++++++++++-------------------------------------- src/or/config.c | 11 ++++++++- src/or/router.c | 2 - 5 files changed, 29 insertions(+), 54 deletions(-)

1 0

[tor/maint-0.2.1] Backport: Generate version tags using Git, not (broken) svn revisions.
by nickm＠torproject.org 06 Apr '11

06 Apr '11

commit 02d93caa09656b1ef73838608258afad5c090105 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 25 14:01:04 2011 -0500 Backport: Generate version tags using Git, not (broken) svn revisions. Partial backport of daa0326aaaa85a760be94ee2360cfa61a9fb5be2 . Resolves bug 2402. Bugfix on 0.2.1.15 (for the part where we switched to git) and on 0.2.1.30 (for the part where we dumped micro-revisions.) --- changes/bug2402_redux | 6 +++++ src/or/Makefile.am | 60 ++++++++++-------------------------------------- src/or/config.c | 4 +- src/or/router.c | 2 - 4 files changed, 21 insertions(+), 51 deletions(-) diff --git a/changes/bug2402_redux b/changes/bug2402_redux new file mode 100644 index 0000000..84be04a --- /dev/null +++ b/changes/bug2402_redux @@ -0,0 +1,6 @@ + o Minor bugfixes + - Use micro-revision numbers in 0.2.1.x instead: apparently, they + were more used than we had known. (Bugfix on 0.2.1.30). + - Instead of generating our micro-version numbers using SVN revisions, + use git revisions instead. Bugfix on 0.2.1.15-rc; fixes bug 2402. + diff --git a/src/or/Makefile.am b/src/or/Makefile.am index ad2476f..51c1b0f 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -55,53 +55,19 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i tor_main.o: micro-revision.i micro-revision.i: FORCE - @svkdir=$$SVKROOT; \ - if test "x$$svkdir" = x ; then \ - svkdir=$$HOME/.svk; \ - fi; \ - if test -d ../../.git && test -x "`which git 2>&1;true`" ; then \ - if test -d ../../.git/svn && test -x "`which git-svn 2>&1;true`" ; then \ - git-svn info ../../README | \ - sed -n 's/^Revision: $[0-9][0-9]*$.*/"\1"/p' \ - > micro-revision.tmp \ - || true; \ - fi; \ - elif test -d ../../.svn && test -x "`which svn 2>&1;true`" ; then \ - svn info ../.. | \ - sed -n 's/^Revision: $[0-9][0-9]*$.*/"\1"/p' > micro-revision.tmp \ - || true; \ - elif test -x "`which svk 2>&1;true`" && test -d $$svkdir/local; then \ - location=../..; \ - rev=x; \ - while test x$$rev = xx; do \ - x=`svk info $$location | \ - sed -n 's/^Mirrored From:.*, Rev\. $[0-9][0-9]*$/\1/p'`; \ - if test x$$x != x; then \ - rev=$$x; \ - break; \ - else \ - loc=`svk info $$location | \ - sed -n 's/^Copied From: $.*$, Rev\. [0-9][0-9]*/\1/p' | \ - head -1`; \ - if test x$$loc = x; then \ - break; \ - else \ - location=/$$loc; \ - fi; \ - fi; \ - done; \ - if test x$$rev != xx; then \ - echo \"$$rev\" > micro-revision.tmp; \ - fi; \ - fi; \ - if test ! -f micro-revision.tmp ; then \ - if test ! -f micro-revision.i ; then \ - echo '""' > micro-revision.i; \ - fi; \ - elif test ! -f micro-revision.i || \ - test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ - mv micro-revision.tmp micro-revision.i; \ - fi; true + @rm -f micro-revision.tmp; \ + if test -d ../../.git && test -x "`which git 2>&1;true`"; then \ + HASH="`git rev-parse --short=16 HEAD`"; \ + echo \"$$HASH\" > micro-revision.tmp; \ + fi; \ + if test ! -f micro-revision.tmp ; then \ + if test ! -f micro-revision.i ; then \ + echo '""' > micro-revision.i; \ + fi; \ + elif test ! -f micro-revision.i || \ + test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ + mv micro-revision.tmp micro-revision.i; \ + fi; true #Dummy target to ensure that micro-revision.i _always_ gets built. FORCE: diff --git a/src/or/config.c b/src/or/config.c index 8397b23..9cd8149 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -829,9 +829,9 @@ get_version(void) { if (_version == NULL) { if (strlen(tor_svn_revision)) { - size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8; + size_t len = strlen(VERSION)+strlen(tor_svn_revision)+16; _version = tor_malloc(len); - tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision); + tor_snprintf(_version, len, "%s (git-%s)", VERSION, tor_svn_revision); } else { _version = tor_strdup(VERSION); } diff --git a/src/or/router.c b/src/or/router.c index 75f592d..4ce4f85 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1586,8 +1586,6 @@ router_guess_address_from_dir_headers(uint32_t *guess) return -1; } -extern const char tor_svn_revision[]; /* from tor_main.c */ - /** Set platform (max length len) to a NUL-terminated short * string describing the version of Tor and the operating system we're * currently running on.

1 0

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

06 Apr '11

commit 671318c3a84657acc8b97cf59871489065264ece Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 10:47:25 2011 -0500 Revert "Simplest fix to bug2402: do not include SVN versions" This reverts commit a1073ee956021ead19d30c2151510dbaced416a8. Apparently, we totally misunderstood how the debian packages were using microrevisions. Better fix that! --- changes/bug2402 | 4 ---- src/or/config.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/changes/bug2402 b/changes/bug2402 deleted file mode 100644 index f16f677..0000000 --- a/changes/bug2402 +++ /dev/null @@ -1,4 +0,0 @@ - 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 209a92d..8397b23 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -827,7 +827,16 @@ static char *_version = NULL; const char * get_version(void) { - return VERSION; + 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; } /** Release additional memory allocated in options

1 0

[tor/master] Add a missing ! to the check for CountPrivatebandwidth.
by nickm＠torproject.org 06 Apr '11

06 Apr '11

commit f6cc8f0ee31d09bc082752d90d72c696cbfa45d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 6 15:24:44 2011 -0400 Add a missing ! to the check for CountPrivatebandwidth. --- src/or/connection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 33f9af6..8b48b96 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1956,7 +1956,7 @@ connection_is_rate_limited(connection_t *conn) or_options_t *options = get_options(); if (conn->linked) return 0; /* Internal connection */ - else if (options->CountPrivateBandwidth && + else if (! options->CountPrivateBandwidth && (tor_addr_family(&conn->addr) == AF_UNSPEC || /* no address */ tor_addr_is_internal(&conn->addr, 0))) return 0; /* Internal address */

1 0

r24569: {website} remove the sales pitch from a FAQ answer, that answer is alr (website/trunk/docs/en)
by Andrew Lewman 06 Apr '11

06 Apr '11

Author: phobos Date: 2011-04-06 13:53:01 +0000 (Wed, 06 Apr 2011) New Revision: 24569 Modified: website/trunk/docs/en/faq-abuse.wml Log: remove the sales pitch from a FAQ answer, that answer is already legally questionable. Modified: website/trunk/docs/en/faq-abuse.wml =================================================================== --- website/trunk/docs/en/faq-abuse.wml 2011-04-05 20:47:58 UTC (rev 24568) +++ website/trunk/docs/en/faq-abuse.wml 2011-04-06 13:53:01 UTC (rev 24569) @@ -398,17 +398,12 @@ technical analysis of the content itself, sting operations, keyboard taps, and other physical investigations. - If you have a complaint about child pornography, you may wish to report + If you have a complaint about child abuse materials, you may wish to report it to the National Center for Missing and Exploited Children, which serves as a national coordination point for investigation of child pornography: <a href="http://www.missingkids.com/">http://www.missingkids.com/</a>. We do not view links you report. - The Tor Project also encourages the use of Tor by law enforcement in - the investigation, stings, and infiltration of child pornography rings. - Please contact us for information on Tor trainings. - - <a id="LegalQuestions"></a> <h3><a class="anchor" href="#LegalQuestions">I have legal questions about Tor abuse.</a></h3>

1 0

r24568: {website} finally provide a more up-to-date tor intro video (website/trunk/docs/en)
by Roger Dingledine 05 Apr '11

05 Apr '11

Author: arma Date: 2011-04-05 20:47:58 +0000 (Tue, 05 Apr 2011) New Revision: 24568 Modified: website/trunk/docs/en/documentation.wml Log: finally provide a more up-to-date tor intro video Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2011-04-05 20:43:54 UTC (rev 24567) +++ website/trunk/docs/en/documentation.wml 2011-04-05 20:47:58 UTC (rev 24568) @@ -83,12 +83,9 @@ </li> <li> - Download and watch Roger's overview talk from What The Hack (<a - href="http://freehaven.net/~arma/wth-anonymous-communication-58.mp4">video</a>, - <a href="http://freehaven.net/~arma/wth1.pdf">slides</a>, <a - href="http://wiki.whatthehack.org/index.php/Anonymous_communication_for_the_Unite…">abstract</a>). - This talk was given in July 2005, back when we were funded by EFF and back - when the network was quite small, but it still provides good background + Download and watch Roger's <a + href="https://media.torproject.org/video/tor-internet-days-2010.mp4">overview + talk from Internet Days in Sweden</a>, which provides good background on how Tor works and what it's for. </li>

1 0

r24567: {} Just a test2 (website)
by Peter Palfrader 05 Apr '11

05 Apr '11

Author: weasel Date: 2011-04-05 20:43:54 +0000 (Tue, 05 Apr 2011) New Revision: 24567 Removed: website/test/ Log: Just a test2

1 0

r24566: {} Just a test2 (website)
by Peter Palfrader 05 Apr '11

05 Apr '11

Author: weasel Date: 2011-04-05 20:43:34 +0000 (Tue, 05 Apr 2011) New Revision: 24566 Added: website/test/ Log: Just a test2

1 0

r24565: {} Just a test (website)
by Peter Palfrader 05 Apr '11

05 Apr '11

Author: weasel Date: 2011-04-05 20:39:19 +0000 (Tue, 05 Apr 2011) New Revision: 24565 Removed: website/test/ Log: Just a test

1 0

r24564: {} Just a test (website)
by Peter Palfrader 05 Apr '11

05 Apr '11

Author: weasel Date: 2011-04-05 20:38:47 +0000 (Tue, 05 Apr 2011) New Revision: 24564 Added: website/test/ Log: Just a test

1 0