June 2012 - tor-commits - lists.torproject.org

[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

[tor/maint-0.2.2] 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] apply 6abb638954b to 0.2.3.16-alpha too
by arma＠torproject.org 07 Jun '12

07 Jun '12

commit b4126dcd22577c02f46497718783fd792ff32588 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 7 03:55:12 2012 -0400 apply 6abb638954b to 0.2.3.16-alpha too --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ceb26da..de1861d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,7 +131,7 @@ Changes in version 0.2.3.16-alpha - 2012-06-05 - Fix a NULL-pointer dereference on a badly formed SETCIRCUITPURPOSE command. Found by mikeyc. Fixes bug 5796; bugfix on 0.2.2.9-alpha. - - Fix a build warning with Clang 3.1 related to our use of vasprint. + - Fix a build warning with Clang 3.1 related to our use of vasprintf. Fixes bug 5969. Bugfix on 0.2.2.11-alpha. - Defensively refactor rend_mid_rendezvous() so that protocol violations and length checks happen in the beginning. Fixes

1 0

[tor/release-0.2.2] rransom points out vasprint is probably not the function
by arma＠torproject.org 07 Jun '12

07 Jun '12

commit 6abb638954be0205cadbfd6e62693ce8327708c8 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 7 03:54:41 2012 -0400 rransom points out vasprint is probably not the function --- ChangeLog | 2 +- ReleaseNotes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78bccbb..fd9097a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,7 +17,7 @@ Changes in version 0.2.2.37 - 2012-06-06 ExitNodes config option. Fixes bug 5283; bugfix on 0.2.0.10-alpha. o Minor bugfixes: - - Fix a build warning with Clang 3.1 related to our use of vasprint. + - Fix a build warning with Clang 3.1 related to our use of vasprintf. Fixes bug 5969. Bugfix on 0.2.2.11-alpha. o Minor features: diff --git a/ReleaseNotes b/ReleaseNotes index 3e8e6d9..c4ff7f5 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -22,7 +22,7 @@ Changes in version 0.2.2.37 - 2012-06-06 ExitNodes config option. Fixes bug 5283; bugfix on 0.2.0.10-alpha. o Minor bugfixes: - - Fix a build warning with Clang 3.1 related to our use of vasprint. + - Fix a build warning with Clang 3.1 related to our use of vasprintf. Fixes bug 5969. Bugfix on 0.2.2.11-alpha. o Minor features:

1 0

[torbrowser/maint-2.3] update vidalia.conf for OS X with proper paths
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit c5306b0e545f7fe3cd65e7a0947b5f60701e4612 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 22:00:49 2012 -0300 update vidalia.conf for OS X with proper paths --- build-scripts/config/vidalia.conf.ff-osx | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build-scripts/config/vidalia.conf.ff-osx b/build-scripts/config/vidalia.conf.ff-osx index 35b0d01..f698d2b 100644 --- a/build-scripts/config/vidalia.conf.ff-osx +++ b/build-scripts/config/vidalia.conf.ff-osx @@ -1,15 +1,15 @@ [General] -BrowserDirectory=../../../TorBrowser.app/Contents/MacOS -BrowserExecutable=firefox-bin +BrowserDirectory=../../../ +BrowserExecutable=TorBrowser.app/Contents/MacOS/firefox-bin +ProfileDirectory=../../Library/Application Support/Firefox/Profiles/profile +DefaultProfileDirectory=TorBrowser.app/Contents/MacOS/defaults/profile +PluginsDirectory=../../MacOS/Data/plugins +DefaultPluginsDirectory=../../MacOS/Data/plugins LanguageCode=en -ProfileDirectory=../../../../../Library/Application Support/Firefox/Profiles/profile -DefaultProfileDirectory=./defaults/profile -PluginsDirectory=../../../../../Library/Application Support/Firefox/Profiles/profile/extensions -DefaultPluginsDirectory=./extensions [Tor] ControlPort=9051 TorExecutable=../../../tor Torrc=../../../../../Library/Vidalia/torrc AutoControl=true -DataDirectory=../../../../Resources/Data/Tor +DataDirectory=../../../../Resources/Data/Tor/

1 0

[torbrowser/maint-2.3] fix torbutton install target so that it gets installed properly
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit 20683a0434db1923e15c2a1b1f37e56e19e986d7 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 22:02:14 2012 -0300 fix torbutton install target so that it gets installed properly --- build-scripts/osx.mk | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 06ad594..fd0e797 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -313,7 +313,7 @@ bundle_%: compressed-bundle_%: LANGCODE=$* make -f osx.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f osx.mk copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref write-tbb-version final + make -f osx.mk copy-files_$* install-torbutton install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref write-tbb-version final touch $(STAMP_DIR)/bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -353,6 +353,9 @@ ifneq ($(LANGCODE), en-US) cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi endif +install-torbutton: torbutton.xpi + cp torbutton.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi + install-httpseverywhere: httpseverywhere.xpi mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org cp httpseverywhere.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org/httpseverywhere.zip

1 0

[torbrowser/maint-2.3] disable asciidoc on Windows when building tor
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit ef26306ce17cefdfa51cc7d672e2fb538aeabaad Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 22:02:33 2012 -0300 disable asciidoc on Windows when building tor --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index e3afbc0..0efc5f0 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" -TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib +TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --disable-asciidoc build-tor:PATH+=:$(BUILT_DIR)/bin build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR)

1 0

[torbrowser/master] update vidalia.conf for OS X with proper paths
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit c5306b0e545f7fe3cd65e7a0947b5f60701e4612 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 22:00:49 2012 -0300 update vidalia.conf for OS X with proper paths --- build-scripts/config/vidalia.conf.ff-osx | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build-scripts/config/vidalia.conf.ff-osx b/build-scripts/config/vidalia.conf.ff-osx index 35b0d01..f698d2b 100644 --- a/build-scripts/config/vidalia.conf.ff-osx +++ b/build-scripts/config/vidalia.conf.ff-osx @@ -1,15 +1,15 @@ [General] -BrowserDirectory=../../../TorBrowser.app/Contents/MacOS -BrowserExecutable=firefox-bin +BrowserDirectory=../../../ +BrowserExecutable=TorBrowser.app/Contents/MacOS/firefox-bin +ProfileDirectory=../../Library/Application Support/Firefox/Profiles/profile +DefaultProfileDirectory=TorBrowser.app/Contents/MacOS/defaults/profile +PluginsDirectory=../../MacOS/Data/plugins +DefaultPluginsDirectory=../../MacOS/Data/plugins LanguageCode=en -ProfileDirectory=../../../../../Library/Application Support/Firefox/Profiles/profile -DefaultProfileDirectory=./defaults/profile -PluginsDirectory=../../../../../Library/Application Support/Firefox/Profiles/profile/extensions -DefaultPluginsDirectory=./extensions [Tor] ControlPort=9051 TorExecutable=../../../tor Torrc=../../../../../Library/Vidalia/torrc AutoControl=true -DataDirectory=../../../../Resources/Data/Tor +DataDirectory=../../../../Resources/Data/Tor/

1 0

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

07 Jun '12

commit bd9992349beca70bcded8b60c63bbc211741f049 Merge: 203c742 ef26306 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 22:02:52 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/vidalia.conf.ff-osx | 14 +++++++------- build-scripts/osx.mk | 5 ++++- build-scripts/windows.mk | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-)

1 0

[torbrowser/master] disable asciidoc on Windows when building tor
by erinn＠torproject.org 07 Jun '12

07 Jun '12

commit ef26306ce17cefdfa51cc7d672e2fb538aeabaad Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 6 22:02:33 2012 -0300 disable asciidoc on Windows when building tor --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index e3afbc0..0efc5f0 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" -TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib +TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --disable-asciidoc build-tor:PATH+=:$(BUILT_DIR)/bin build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR)

1 0