May 2013 - tor-commits - lists.torproject.org

[flashproxy/master] Messed up the struct literal syntax.
by dcf＠torproject.org 11 May '13

11 May '13

commit accf2fe0da2b4e1bff9e7edf2c5d6a333730706f Author: David Fifield <david(a)bamsoftware.com> Date: Sat May 11 16:07:28 2013 -0700 Messed up the struct literal syntax. --- websocket-transport/socks.go | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/websocket-transport/socks.go b/websocket-transport/socks.go index 94732a0..1fa847f 100644 --- a/websocket-transport/socks.go +++ b/websocket-transport/socks.go @@ -94,7 +94,7 @@ func SendSocks4aResponse(w io.Writer, code byte, addr *net.TCPAddr) error { return err } -var emptyAddr = net.TCPAddr{IP = net.IPv4(0, 0, 0, 0), Port = 0} +var emptyAddr = net.TCPAddr{IP: net.IPv4(0, 0, 0, 0), Port: 0} // Send a SOCKS4a response code 0x5a. func SendSocks4aResponseGranted(w io.Writer, addr *net.TCPAddr) error {

1 0

[flashproxy/master] Tag struct literal fields.
by dcf＠torproject.org 11 May '13

11 May '13

commit 6e3983eb90dc699a2d331761bfda4c54dc358dbd Author: David Fifield <david(a)bamsoftware.com> Date: Sat May 11 16:02:32 2013 -0700 Tag struct literal fields. Suggested by "go vet". socks.go:97:17: net.TCPAddr struct literal uses untagged fields --- websocket-transport/socks.go | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/websocket-transport/socks.go b/websocket-transport/socks.go index a2f525c..94732a0 100644 --- a/websocket-transport/socks.go +++ b/websocket-transport/socks.go @@ -94,7 +94,7 @@ func SendSocks4aResponse(w io.Writer, code byte, addr *net.TCPAddr) error { return err } -var emptyAddr = net.TCPAddr{net.IPv4(0, 0, 0, 0), 0} +var emptyAddr = net.TCPAddr{IP = net.IPv4(0, 0, 0, 0), Port = 0} // Send a SOCKS4a response code 0x5a. func SendSocks4aResponseGranted(w io.Writer, addr *net.TCPAddr) error {

1 0

[flashproxy/master] Remove extra Sprintf argument.
by dcf＠torproject.org 11 May '13

11 May '13

commit 8878291065a5890e208ce098049f1fec824b3584 Author: David Fifield <david(a)bamsoftware.com> Date: Sat May 11 15:57:47 2013 -0700 Remove extra Sprintf argument. Reported by "go vet". socks.go:58:25: wrong number of args in Sprintf call: 1 needed but 2 args --- websocket-transport/socks.go | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/websocket-transport/socks.go b/websocket-transport/socks.go index 89d83ad..a2f525c 100644 --- a/websocket-transport/socks.go +++ b/websocket-transport/socks.go @@ -55,7 +55,7 @@ func ReadSocks4aConnect(s io.Reader) (string, error) { _, err = r.ReadBytes('\x00') if err != nil { - return "", errors.New(fmt.Sprintf("reading SOCKS userid: %s", n, err)) + return "", errors.New(fmt.Sprintf("reading SOCKS userid: %s", err)) } var port int

1 0

[tor-browser/tor-browser-17.0.5esr-3] fixup! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 11 May '13

11 May '13

commit ae29755a16b145eb1e783b16d1bd58a5df72060c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat May 11 14:53:19 2013 -0700 fixup! Tor Browser's Firefox preference overrides. Parse error in prefs.. --- browser/app/profile/000-tor-browser.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c9c00f3..e49c950 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -110,7 +110,7 @@ pref("extensions.autoDisableScopes", 0); pref("extensions.bootstrappedAddons", "{}"); pref("extensions.checkCompatibility.4.*", false); pref("extensions.databaseSchema", 3); -pref("extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,tor-launcher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5" +pref("extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,tor-launcher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5"); pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); pref("extensions.enabledScopes", 1); pref("extensions.pendingOperations", false);

1 0

[tlsdate/master] Merge pull request #110 from elly/unittest-rmrf
by ioerror＠torproject.org 11 May '13

11 May '13

commit 35ff6cee8e15d529b67785c3b91ebd2f8039eb86 Merge: 37b1683 ed1b336 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat May 11 12:45:20 2013 -0700 Merge pull request #110 from elly/unittest-rmrf tlsdated: remove rmrf() src/tlsdated-unittest.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-)

1 0

[tlsdate/master] Add Elly as an author
by ioerror＠torproject.org 11 May '13

11 May '13

commit 8182b05e04aa2bc9f85ec97c4d710a8ee41b7654 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat May 11 12:46:42 2013 -0700 Add Elly as an author --- AUTHORS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/AUTHORS b/AUTHORS index 43ce2ac..def276b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,3 @@ Jacob Appelbaum <jacob(a)appelbaum.net> Christian Grothoff <christian(a)grothoff.org> +Elly Jones <elly(a)leptoquark.net>

1 0

[tlsdate/master] update policy per issue 109
by ioerror＠torproject.org 11 May '13

11 May '13

commit 3f69a2245fddf5c63e2325c30d68c324e32dcdda Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat May 11 12:51:29 2013 -0700 update policy per issue 109 --- apparmor-profile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/apparmor-profile b/apparmor-profile index df278af..264de28 100644 --- a/apparmor-profile +++ b/apparmor-profile @@ -27,6 +27,7 @@ # Required for gethostbyname /etc/resolv.conf r, + /run/resolvconf/resolv.conf r, /etc/nsswitch.conf r, /etc/localtime r, /etc/nsswitch.conf r, @@ -88,6 +89,7 @@ # Required for gethostbyname /etc/resolv.conf r, + /run/resolvconf/resolv.conf r, /etc/nsswitch.conf r, /etc/localtime r, /etc/nsswitch.conf r,

1 0

[tlsdate/master] tlsdated: remove rmrf()
by ioerror＠torproject.org 11 May '13

11 May '13

commit ed1b336ca84f2f71c70f91d0d7aeb5a3ae4b547b Author: elly <elly(a)leptoquark.net> Date: Thu May 9 13:40:16 2013 -0400 tlsdated: remove rmrf() This function, while handy and presently used safely, could become dangerous if someone later adds a call to it that passes in attacker-controlled input. Therefore, hardcode calls to unlink(2) and rmdir(2) for the files tlsdated presently creates. This has the pleasant (?) side-effect of breaking unit-tests whenever tlsdated creates files we don't explicitly list on disk. BUG=None TEST=unit Signed-off-by: Elly Fong-Jones <ellyjones(a)chromium.org> --- src/tlsdated-unittest.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/tlsdated-unittest.c b/src/tlsdated-unittest.c index baed329..cb30313 100644 --- a/src/tlsdated-unittest.c +++ b/src/tlsdated-unittest.c @@ -27,14 +27,13 @@ FIXTURE_SETUP(tempdir) { ASSERT_NE(NULL, p); } -int rmrf(char *dir) { - char buf[256]; - snprintf(buf, sizeof(buf), "rm -rf %s", dir); - return system(buf); -} - FIXTURE_TEARDOWN(tempdir) { - ASSERT_EQ(0, rmrf(self->path)); + char buf[256]; + snprintf(buf, sizeof(buf), "%s/load", self->path); + unlink(buf); + snprintf(buf, sizeof(buf), "%s/save", self->path); + unlink(buf); + ASSERT_EQ(0, rmdir(self->path)); } int write_time(const char *path, time_t time) {

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 11 May '13

11 May '13

commit f6dadb5495806b2cea5f3057ec206e21401468dc Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 11 18:45:10 2013 +0000 Update translations for gettor_completed --- zh_CN/gettor.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index f5fbf64..1e4a59a 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-11 18:14+0000\n" +"PO-Revision-Date: 2013-05-11 18:37+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 11 May '13

11 May '13

commit c21686df8a1e6e349759989b04ebab68ff59585a Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 11 18:45:05 2013 +0000 Update translations for gettor --- zh_CN/gettor.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index f5fbf64..1e4a59a 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-11 18:14+0000\n" +"PO-Revision-Date: 2013-05-11 18:37+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0