- tor-commits - lists.torproject.org

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit 248881b6f1cbb801fdd54b1d702d1693d405fc04 Merge: bd99923 de216a9 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jun 7 17:58:33 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 9 ++++----- build-scripts/osx.mk | 2 +- changelog.linux-2.2 | 12 +++++++++++- changelog.osx-2.2 | 12 +++++++++++- changelog.windows-2.2 | 12 +++++++++++- 5 files changed, 38 insertions(+), 9 deletions(-)

1 0

[tor/release-0.2.2] Send a CRLF at the end of a STATUS_* event, not in the middle of it
by arma＠torproject.org 07 Jun '12

07 Jun '12

commit 0dc47dfebffe9547bc95ba3f2a64fc5f4b15f270 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 7 03:22:06 2012 +0000 Send a CRLF at the end of a STATUS_* event, not in the middle of it Fixes bug 6094; bugfix on commit 3a9351b57e528b1d0bd2e72bcf78db7c91b2ff8f. --- changes/bug6094 | 8 ++++++++ src/or/control.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug6094 b/changes/bug6094 new file mode 100644 index 0000000..835d127 --- /dev/null +++ b/changes/bug6094 @@ -0,0 +1,8 @@ + o Major bugfixes: + + - Send a CRLF at the end of each STATUS_* control-port event. A + change introduced in 0.2.3.16-alpha caused Tor to emit the CRLF + in the middle of a STATUS_* event; among other things, this + caused Vidalia to freeze. Fixes bug 6094; bugfix on + 0.2.3.16-alpha. + diff --git a/src/or/control.c b/src/or/control.c index 8aa4240..782468f 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3957,14 +3957,14 @@ control_event_status(int type, int severity, const char *format, va_list args) log_warn(LD_BUG, "Unrecognized status severity %d", severity); return -1; } - if (tor_snprintf(format_buf, sizeof(format_buf), "650 %s %s\r\n", + if (tor_snprintf(format_buf, sizeof(format_buf), "650 %s %s", status, sev)<0) { log_warn(LD_BUG, "Format string too long."); return -1; } tor_vasprintf(&user_buf, format, args); - send_control_event(type, ALL_FORMATS, "%s %s", format_buf, user_buf); + send_control_event(type, ALL_FORMATS, "%s %s\r\n", format_buf, user_buf); tor_free(user_buf); return 0; }

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 07 Jun '12

07 Jun '12

commit e61c6adfa46501f5c69dd94e16b8db2993cf9eac Merge: 6abb638 0dc47df Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 7 15:39:44 2012 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug6094 | 8 ++++++++ src/or/control.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.2] remove changes for bug6094, since it wasn't released here
by arma＠torproject.org 07 Jun '12

07 Jun '12

commit fce6eb1c44e87bc20e1cf62bd46d8fe6e356008e Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 7 15:40:16 2012 -0400 remove changes for bug6094, since it wasn't released here --- changes/bug6094 | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/changes/bug6094 b/changes/bug6094 deleted file mode 100644 index 835d127..0000000 --- a/changes/bug6094 +++ /dev/null @@ -1,8 +0,0 @@ - o Major bugfixes: - - - Send a CRLF at the end of each STATUS_* control-port event. A - change introduced in 0.2.3.16-alpha caused Tor to emit the CRLF - in the middle of a STATUS_* event; among other things, this - caused Vidalia to freeze. Fixes bug 6094; bugfix on - 0.2.3.16-alpha. -

1 0

[tor/master] typo noticed by "_raptor"
by arma＠torproject.org 07 Jun '12

07 Jun '12

commit 167f6f1e966312693a91ecdde4c01a3a2a811e13 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 7 15:35:19 2012 -0400 typo noticed by "_raptor" --- src/common/compat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 334ea1b..91fa182 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -143,7 +143,7 @@ tor_open_cloexec(const char *path, int flags, unsigned mode) return fd; } -/** As fpoen(path,mode), but ensures that the O_CLOEXEC bit is set on the +/** As fopen(path,mode), but ensures that the O_CLOEXEC bit is set on the * underlying file handle. */ FILE * tor_fopen_cloexec(const char *path, const char *mode)

1 0

[githax/master] Script to automatically make a tor-next branch
by nickm＠torproject.org 07 Jun '12

07 Jun '12

commit 9374c1c917938eb2b94166137a349d9e9bda3bec Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 7 13:56:09 2012 -0400 Script to automatically make a tor-next branch --- scripts/make-tor-next | 181 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 181 insertions(+), 0 deletions(-) diff --git a/scripts/make-tor-next b/scripts/make-tor-next new file mode 100755 index 0000000..0b45e34 --- /dev/null +++ b/scripts/make-tor-next @@ -0,0 +1,181 @@ +#!/usr/bin/python +# Copyright 2012, The Tor Project, Inc. -- License at end of file. + +import logging +import os +import re +import subprocess +import sys +import time + +# Where to build the tor-next tree. this needs to be a clone of the main tor repo +DIR = os.path.expanduser("~/src/tor-next") +# What file in that directory do you use for your list of branches to include? +BRANCHLIST = os.path.join(DIR, "TOR_NEXT_BRANCHES") + +# String to add at the front of repository names. If you don't have +# git-rw access, you'll want to change this to: +# REPO_PREFIX = "git://git.torproject.org" +REPO_PREFIX = "git(a)git-rw.torproject.org:" +# List of repositories named in the old fashion (i.e., not with a "user" prefix) +GRANDFATHERED_REPOS = set(""" + arma debian erinn hoganrobert ioerror karsten linus mikeperry nickm + rpm rransom sebastian sjm + """.split()) +# What branch do we base tor-next on? +BASE_BRANCH = "origin/master" +# To which repository do we push the pu branch and the tor-next branch? +TARGET_REPO = "nickm" + +logging.basicConfig(level="INFO", + format=">>>> %(levelname)s: %(message)s") + + +# 0. PARSE STUFF. + +def read_remotes_and_branches(fname): + branches = [] + with open(fname) as f: + for line in f: + line = re.sub(r'#.*', '', line) + line = line.strip() + if not line: + continue + if "/" not in line: + logging.warn("Bogus absolute branch %s", line) + branches.append(line) + + remotes = set() + for b in branches: + remotes.add(b.split("/")[0]) + + return remotes, branches + +remotes, branches = read_remotes_and_branches(BRANCHLIST) + +# 1. UPDATE REMOTE STUFF. + +def repoName(remote): + if remote == "origin": + return "%s/tor.git" % REPO_PREFIX + elif remote in GRANDFATHERED_REPOS: + return "%s/%s/tor.git" % (REPO_PREFIX, remote) + else: + return "%s/user/%s/tor.git" % (REPO_PREFIX, remote) + +def fix_remotes(want_remotes): + # what remotes do we have? + have_remotes = {} + for line in subprocess.check_output(["git", "remote", "-v"]).split("\n"): + fields = line.split() + if not fields: continue + if fields[2] != "(fetch)": + continue + have_remotes[fields[0]] = fields[1] + for rmt in want_remotes: + repo = repoName(rmt) + if rmt not in have_remotes: + logging.info("Adding remote %s", rmt) + subprocess.check_call(["git", "remote", "add", rmt, repo]) + elif have_remotes[rmt] != repo: + logging.info("changing URL on remote %s", rmt) + subprocess.check_call(["git", "remote", "set-url", rmt, repo]) + else: + logging.info("remote %s looks ok", rmt) + +def update_remotes(update_remotes): + logging.info("updating origin") + subprocess.check_call(["git", "fetch", "origin"]) + for rmt in update_remotes: + logging.info("updating %s", rmt) + subprocess.check_call(["git", "fetch", rmt]) + +os.chdir(DIR) +fix_remotes(remotes) +update_remotes(remotes) + +# 2. MERGE STUFF INTO A NEW TEMP BRANCH + +temp_branch_name = time.strftime("pu-%Y%m%d%H%M%S", time.gmtime()) +subprocess.check_call(["git", "branch", "-f", temp_branch_name, BASE_BRANCH]) +subprocess.check_call(["git", "checkout", temp_branch_name]) + +def merge_branch(branch): + logging.info("Merging %s", branch) + try: + subprocess.check_call(["git", "merge", "-q", "--no-ff", + "--no-edit", branch]) + return True + except subprocess.CalledProcessError: + logging.warn("Unable to merge %s; rolling back.", branch) + subprocess.check_call(["git", "merge", "--abort"]) + return False + +bad_branches = [] +for b in branches: + if not merge_branch(b): + bad_branches.append(b) + +if bad_branches: + logging.warn("!!!!!! I couldn't merge %d branches", len(bad_branches)) + for b in bad_branches: + logging.warn("Unable to merge branch: %s", b) + sys.exit(1) + +# 3. WILL IT STILL BUILD? + +logging.info("Looks okay to me. Will it compile?") +try: + logfile = temp_branch_name+".log" + with open(logfile, 'w') as f: + logging.info("(logging output to %s", logfile) + logging.info("configuring...") + subprocess.check_call(["sh", "autogen.sh"], stdout=f,stderr=f) + subprocess.check_call(["./configure", "--enable-gcc-warnings"], + stdout=f, stderr=f) + logging.info("building...") + subprocess.check_call(["make", "clean"], stdout=f, stderr=f) + subprocess.check_call(["make", "-j4"], stdout=f, stderr=f) +except CalledProcessError: + logging.warn("Build wasn't clean. Exiting") + sys.exit(1) + +logging.info("Build seemed to work. Pushing it!") + + +subprocess.check_call(["git", "push", "nickm", temp_branch_name]) +subprocess.check_call(["git", "push", "nickm", "+%s:tor-next"%(temp_branch_name)]) +logging.info("Pushed tor-next. It's a great big beautiful tomorrow.") + + +LICENSE = """ +Copyright 2012, The Tor Project, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +"""

1 0

[tor/master] Merge remote-tracking branch 'arma/bug3886'
by nickm＠torproject.org 07 Jun '12

07 Jun '12

commit b0bab82790836e3456d946e5a16298508b740ae2 Merge: 99618a9 44f6be4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 7 13:30:55 2012 -0400 Merge remote-tracking branch 'arma/bug3886' Conflicts: src/or/dirserv.c changes/bug3886 | 5 +++++ src/or/dirserv.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --cc src/or/dirserv.c index ef6c35e,00b8205..67b18fb --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@@ -1855,8 -1821,8 +1855,8 @@@ dirserv_thinks_router_is_hs_dir(const r * *clients* suffering from bug 2722 are obsolete. The first version * to fix the bug was 0.2.2.25-alpha. */ return (router->wants_to_be_hs_dir && router->dir_port && - uptime > get_options()->MinUptimeHidServDirectoryV2 && + uptime >= get_options()->MinUptimeHidServDirectoryV2 && - router->is_running); + node->is_running); } /** Look through the routerlist, the Mean Time Between Failure history, and

1 0

[tor/master] let private tor networks more reliably handle hidden services
by nickm＠torproject.org 07 Jun '12

07 Jun '12

commit 44f6be4681cd3fcdab0e1a6d892b8918373e12d3 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 1 03:13:27 2011 -0400 let private tor networks more reliably handle hidden services this is a tweak on the fix in f87c6f100d (see also #2088) --- changes/bug3886 | 5 +++++ src/or/dirserv.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug3886 b/changes/bug3886 new file mode 100644 index 0000000..691d4ef --- /dev/null +++ b/changes/bug3886 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix an edge case where TestingTorNetwork is set but the authorities + and relays all have an uptime of zero, where the private Tor network + could briefly lack support for hidden services. Fixes bug 3886; + bugfix on 0.2.2.18-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 7df9a2f..00b8205 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1821,7 +1821,7 @@ dirserv_thinks_router_is_hs_dir(routerinfo_t *router, time_t now) * *clients* suffering from bug 2722 are obsolete. The first version * to fix the bug was 0.2.2.25-alpha. */ return (router->wants_to_be_hs_dir && router->dir_port && - uptime > get_options()->MinUptimeHidServDirectoryV2 && + uptime >= get_options()->MinUptimeHidServDirectoryV2 && router->is_running); }

1 0

[tor/master] Send a CRLF at the end of a STATUS_* event, not in the middle of it
by nickm＠torproject.org 07 Jun '12

07 Jun '12

commit 0dc47dfebffe9547bc95ba3f2a64fc5f4b15f270 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 7 03:22:06 2012 +0000 Send a CRLF at the end of a STATUS_* event, not in the middle of it Fixes bug 6094; bugfix on commit 3a9351b57e528b1d0bd2e72bcf78db7c91b2ff8f. --- changes/bug6094 | 8 ++++++++ src/or/control.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug6094 b/changes/bug6094 new file mode 100644 index 0000000..835d127 --- /dev/null +++ b/changes/bug6094 @@ -0,0 +1,8 @@ + o Major bugfixes: + + - Send a CRLF at the end of each STATUS_* control-port event. A + change introduced in 0.2.3.16-alpha caused Tor to emit the CRLF + in the middle of a STATUS_* event; among other things, this + caused Vidalia to freeze. Fixes bug 6094; bugfix on + 0.2.3.16-alpha. + diff --git a/src/or/control.c b/src/or/control.c index 8aa4240..782468f 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3957,14 +3957,14 @@ control_event_status(int type, int severity, const char *format, va_list args) log_warn(LD_BUG, "Unrecognized status severity %d", severity); return -1; } - if (tor_snprintf(format_buf, sizeof(format_buf), "650 %s %s\r\n", + if (tor_snprintf(format_buf, sizeof(format_buf), "650 %s %s", status, sev)<0) { log_warn(LD_BUG, "Format string too long."); return -1; } tor_vasprintf(&user_buf, format, args); - send_control_event(type, ALL_FORMATS, "%s %s", format_buf, user_buf); + send_control_event(type, ALL_FORMATS, "%s %s\r\n", format_buf, user_buf); tor_free(user_buf); return 0; }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 07 Jun '12

07 Jun '12

commit 99618a9641d02b7b99a79c71517203bb70043515 Merge: b4126dc 0dc47df Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 7 09:46:14 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug6094 | 8 ++++++++ src/or/control.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0