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

[goptlib/master] Rename ConnectOr to DialOr.
by dcf＠torproject.org 11 Dec '13

11 Dec '13

commit 54975c056a7afc1c656ba0bf44971ec00137a51a Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 10 22:55:57 2013 -0800 Rename ConnectOr to DialOr. --- examples/dummy-server/dummy-server.go | 2 +- pt.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/dummy-server/dummy-server.go b/examples/dummy-server/dummy-server.go index 0ca901c..c01876e 100644 --- a/examples/dummy-server/dummy-server.go +++ b/examples/dummy-server/dummy-server.go @@ -52,7 +52,7 @@ func handler(conn net.Conn) error { handlerChan <- -1 }() - or, err := pt.ConnectOr(&ptInfo, conn.RemoteAddr(), "dummy") + or, err := pt.DialOr(&ptInfo, conn.RemoteAddr(), "dummy") if err != nil { return err } diff --git a/pt.go b/pt.go index 02cc2c6..50a2e1f 100644 --- a/pt.go +++ b/pt.go @@ -52,7 +52,7 @@ // ... // func handler(conn net.Conn) error { // defer conn.Close() -// or, err := pt.ConnectOr(&ptInfo, conn.RemoteAddr(), "foo") +// or, err := pt.DialOr(&ptInfo, conn.RemoteAddr(), "foo") // if err != nil { // return // } @@ -764,11 +764,11 @@ func extOrPortSetup(s io.ReadWriter, addr net.Addr, methodName string) error { return nil } -// Connect to info.ExtendedOrAddr if defined, or else info.OrAddr, and return an -// open net.Conn. If connecting to the extended OR port, extended OR port +// Dial info.ExtendedOrAddr if defined, or else info.OrAddr, and return an open +// net.Conn. If connecting to the extended OR port, extended OR port // authentication à la 217-ext-orport-auth.txt is done before returning; an // error is returned if authentication fails. -func ConnectOr(info *ServerInfo, addr net.Addr, methodName string) (net.Conn, error) { +func DialOr(info *ServerInfo, addr net.Addr, methodName string) (net.Conn, error) { if info.ExtendedOrAddr == nil { return net.DialTCP("tcp", nil, info.OrAddr) }

1 0

[goptlib/master] Also need AuthCookie to do ExtOrPort.
by dcf＠torproject.org 11 Dec '13

11 Dec '13

commit f27f30f16d6f8ac0b566a09c5c63c3f899569a14 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 10 23:32:20 2013 -0800 Also need AuthCookie to do ExtOrPort. --- pt.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt.go b/pt.go index 9ac14e5..3478905 100644 --- a/pt.go +++ b/pt.go @@ -773,7 +773,7 @@ func extOrPortSetup(s io.ReadWriter, addr net.Addr, methodName string) error { // authentication à la 217-ext-orport-auth.txt is done before returning; an // error is returned if authentication fails. func DialOr(info *ServerInfo, addr net.Addr, methodName string) (net.Conn, error) { - if info.ExtendedOrAddr == nil { + if info.ExtendedOrAddr == nil || info.AuthCookie == nil { return net.DialTCP("tcp", nil, info.OrAddr) }

1 0

[goptlib/master] Extended ORPort is in proposal 196, not pt-spec.txt.
by dcf＠torproject.org 11 Dec '13

11 Dec '13

commit 683a1e9754037c42955602871032cdce40cea8d0 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 10 22:05:16 2013 -0800 Extended ORPort is in proposal 196, not pt-spec.txt. --- pt.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pt.go b/pt.go index ec2407f..02cc2c6 100644 --- a/pt.go +++ b/pt.go @@ -95,6 +95,9 @@ // Tor pluggable transports specification: // https://gitweb.torproject.org/torspec.git/blob/HEAD:/pt-spec.txt. // +// Extended ORPort: +// https://gitweb.torproject.org/torspec.git/blob/HEAD:/proposals/196-transpor…. +// // Extended ORPort Authentication: // https://gitweb.torproject.org/torspec.git/blob/HEAD:/proposals/217-ext-orpo…. //

1 0

r26468: {website} make the "other donation options" look like a link. (website/trunk/css)
by Andrew Lewman 11 Dec '13

11 Dec '13

Author: phobos Date: 2013-12-11 05:52:12 +0000 (Wed, 11 Dec 2013) New Revision: 26468 Modified: website/trunk/css/layout.css Log: make the "other donation options" look like a link. Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2013-12-11 04:51:27 UTC (rev 26467) +++ website/trunk/css/layout.css 2013-12-11 05:52:12 UTC (rev 26468) @@ -1287,5 +1287,4 @@ font-weight: bold; } .dbox.dl select{ -width: 70px; --webkit-appearance: none;-moz-appearance: none;outline-inset:1px;} +width: 70px;outline-inset:1px;}

1 0

r26467: {website} more fixes to the layout css (website/trunk/css)
by Andrew Lewman 11 Dec '13

11 Dec '13

Author: phobos Date: 2013-12-11 04:51:27 +0000 (Wed, 11 Dec 2013) New Revision: 26467 Modified: website/trunk/css/layout.css Log: more fixes to the layout css Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2013-12-10 21:46:42 UTC (rev 26466) +++ website/trunk/css/layout.css 2013-12-11 04:51:27 UTC (rev 26467) @@ -1047,7 +1047,7 @@ .dbox input.donate-btn { background: url(../images/btn_donateCC_LG.gif) left top no-repeat transparent; height: 26px; - width: 122px; + width: 150px; margin-top: 0px; display: block; background-color: transparent; @@ -1282,7 +1282,10 @@ } /* End hide from IE-mac */ -.dbox.dl p:last-child a{color:#000; text-decoration:none;} +.dbox.dl p:last-child a{color: #785688; +text-decoration: underline; +font-weight: bold; +} .dbox.dl select{ width: 70px; -webkit-appearance: none;-moz-appearance: none;outline-inset:1px;}

1 0

[tor-browser-bundle/master] Update changelog for Torbutton and Tor Launcher fixups.
by mikeperry＠torproject.org 11 Dec '13

11 Dec '13

commit f2c20ad417865f6e68b60f79b8475c9d4bfb2f6c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Dec 10 20:01:55 2013 -0800 Update changelog for Torbutton and Tor Launcher fixups. --- Bundle-Data/Docs/ChangeLog.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c359de1..ad1ad0f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,15 +1,17 @@ -Tor Browser Bundle 3.5rc1 -- Dec 9 2013 +Tor Browser Bundle 3.5rc1 -- Dec 11 2013 * All Platforms * Update Firefox to 24.2.0esr * Update NoScript to 2.6.8.7 * Update HTTPS-Everywhere to 3.4.4tbb (special TBB tag) * Tag includes a patch to handle enabling/disabling Mixed Content Blocking * Misc: Disable HTTPS-Everywhere first-run tooltips - * Update Tor Launcher to 0.2.4 + * Update Tor Launcher to 0.2.4.1 + * Bug 10147: Adblock Plus interferes w/Tor Launcher dialog * Bug 10201: FF ESR 24 hangs during exit on Mac OS * Bug 9984: Support running Tor Launcher from InstantBird * Misc: Support browser directory location API changes in Firefox 24 - * Update Torbutton to 1.6.5 + * Update Torbutton to 1.6.5.1 + * Bug 10352: Clear FF24 Private Browsing Mode data during New Identity * Bug 8167: Update cache isolation for FF24 API changes * Bug 10201: FF ESR 24 hangs during exit on Mac OS * Bug 10078: Properly clear crypto tokens during New Identity on FF24

1 0

[tor-browser-bundle/master] Name Linus's gpg key properly.
by mikeperry＠torproject.org 11 Dec '13

11 Dec '13

commit 40c778c9a3a31b42d1f7e3a6ce3be3a90a5d241c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Dec 10 20:04:50 2013 -0800 Name Linus's gpg key properly. --- gitian/gpg/linus.gpg | Bin 0 -> 61902 bytes gitian/gpg/ln5.gpg | Bin 61902 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/linus.gpg b/gitian/gpg/linus.gpg new file mode 100644 index 0000000..66a2f68 Binary files /dev/null and b/gitian/gpg/linus.gpg differ diff --git a/gitian/gpg/ln5.gpg b/gitian/gpg/ln5.gpg deleted file mode 100644 index 66a2f68..0000000 Binary files a/gitian/gpg/ln5.gpg and /dev/null differ

1 0

[tor-browser-bundle/master] Bump Torbutton version for New Identity fix.
by mikeperry＠torproject.org 11 Dec '13

11 Dec '13

commit bc9239652ea8cecf0ed93cdd31f015da06a2165d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Dec 10 20:05:03 2013 -0800 Bump Torbutton version for New Identity fix. --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 9789f04..845e811 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -7,7 +7,7 @@ TORBROWSER_TAG=tor-browser-24.2.0esr-3.5rc1-build2 TOR_TAG=tor-0.2.4.18-rc OPENSSL_TAG=openssl-101e-no-gmt-time-v1 TORLAUNCHER_TAG=0.2.4.1 -TORBUTTON_TAG=1.6.5 +TORBUTTON_TAG=1.6.5.1 HTTPSE_TAG=3.4.4tbb NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0

[torbutton/master] Bug 10352: Clear Private Browsing Mode data during New Identity
by mikeperry＠torproject.org 11 Dec '13

11 Dec '13

commit 06f74292f7e0e886f1d1fdde1307e9f54d3e9bf9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Dec 10 19:56:20 2013 -0800 Bug 10352: Clear Private Browsing Mode data during New Identity Needed on FF24. The current cache, cookie and DOM Storage APIs do not otherwise clear private browsing mode data. --- src/chrome/content/torbutton.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3b76595..b870048 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1593,6 +1593,9 @@ function torbutton_do_new_identity() { } } + torbutton_log(3, "Ending any remaining private browsing sessions."); + obsSvc.notifyObservers(null, "last-pb-context-exited", ""); + torbutton_log(3, "New Identity: Opening a new browser window"); // Open a new window with the TBB check homepage

1 0

[torbutton/master] Update changelog and version for 1.6.5.1.
by mikeperry＠torproject.org 11 Dec '13

11 Dec '13

commit 05e78c9063f10ab08ed9e46273984035dc631bb6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Dec 10 19:58:11 2013 -0800 Update changelog and version for 1.6.5.1. --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 4028ca3..befcf4f 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.6.5.1: + 10 Dec 2013 + * Bug 10352: Clear FF24 Private Browsing Mode data during New Identity + 1.6.5: 9 Dec 2013 * Bug 8167: Update cache isolation to use getFirstPartyURIFromChannel() for FF24 diff --git a/src/install.rdf b/src/install.rdf index 4423fca..89163bb 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.5</em:version> + <em:version>1.6.5.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0