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

[obfs-flash/master] Port to goptlib.
by dcf＠torproject.org 16 Dec '13

16 Dec '13

commit d3dbd48275e568c59f4ffb183b2c12d44ae24cd5 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 16 15:05:34 2013 -0800 Port to goptlib. --- obfs-flash-server.go | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/obfs-flash-server.go b/obfs-flash-server.go index a62af47..d407547 100644 --- a/obfs-flash-server.go +++ b/obfs-flash-server.go @@ -16,7 +16,7 @@ import ( "time" ) -import "git.torproject.org/pluggable-transports/websocket.git/src/pt" +import "git.torproject.org/pluggable-transports/goptlib.git" const connStackSize = 10 const subprocessWaitTimeout = 30 * time.Second @@ -136,11 +136,11 @@ func findBindAddr(r io.Reader, methodName string) (*net.TCPAddr, error) { keyword := fields[0] args := fields[1:] if keyword == "SMETHOD" && len(args) >= 2 && args[0] == methodName { - bindAddr, err := net.ResolveTCPAddr("tcp", args[1]) + bindaddr, err := net.ResolveTCPAddr("tcp", args[1]) if err != nil { return nil, err } - return bindAddr, nil + return bindaddr, nil } else if keyword == "SMETHODS" && len(args) == 1 && args[0] == "DONE" { break } @@ -286,7 +286,7 @@ func handleInternalConnection(conn *net.TCPConn, chain *Chain) error { extConn := elem.(*net.TCPConn) log("Connecting to ORPort using remote addr %s.", extConn.RemoteAddr()) log("handleInternalConnection: now %d conns buffered.", chain.Conns.Length()) - or, err := pt.ConnectOr(&ptInfo, extConn, chain.MethodName) + or, err := pt.DialOr(&ptInfo, extConn.RemoteAddr().String(), chain.MethodName) if err != nil { log("Error connecting to ORPort: %s.", err) return err @@ -322,7 +322,7 @@ loop: } } -func startChain(methodName string, bindAddr *net.TCPAddr, plugins []ServerTransportPlugin) (*Chain, error) { +func startChain(methodName string, bindaddr *net.TCPAddr, plugins []ServerTransportPlugin) (*Chain, error) { chain := &Chain{} var err error @@ -347,9 +347,9 @@ func startChain(methodName string, bindAddr *net.TCPAddr, plugins []ServerTransp } log("Proxy chain on %s.", chain.ProcsAddr) - // Start external Internet listener (listens on bindAddr and connects to + // Start external Internet listener (listens on bindaddr and connects to // proxy chain). - chain.ExtLn, err = net.ListenTCP("tcp", bindAddr) + chain.ExtLn, err = net.ListenTCP("tcp", bindaddr) if err != nil { log("Error opening external listener: %s.", err) chain.Shutdown() @@ -435,30 +435,35 @@ func main() { log("Starting.") + var err error conf := getConfiguration() - ptInfo = pt.ServerSetup(conf.MethodNames()) + ptInfo, err = pt.ServerSetup(conf.MethodNames()) + if err != nil { + log("Error in ServerSetup: %s", err) + os.Exit(1) + } chains := make([]*Chain, 0) - for _, bindAddr := range ptInfo.BindAddrs { + for _, bindaddr := range ptInfo.Bindaddrs { // Override tor's requested port (which is 0 if this transport // has not been run before) with the one requested by the --port // option. if port != 0 { - bindAddr.Addr.Port = port + bindaddr.Addr.Port = port } - plugins, err := conf.PluginList(bindAddr.MethodName) + plugins, err := conf.PluginList(bindaddr.MethodName) if err != nil { - pt.SmethodError(bindAddr.MethodName, err.Error()) + pt.SmethodError(bindaddr.MethodName, err.Error()) continue } - chain, err := startChain(bindAddr.MethodName, bindAddr.Addr, plugins) + chain, err := startChain(bindaddr.MethodName, bindaddr.Addr, plugins) if err != nil { - pt.SmethodError(bindAddr.MethodName, err.Error()) + pt.SmethodError(bindaddr.MethodName, err.Error()) continue } - pt.Smethod(bindAddr.MethodName, chain.ExtLn.Addr()) + pt.Smethod(bindaddr.MethodName, chain.ExtLn.Addr()) chains = append(chains, chain) } pt.SmethodsDone()

1 0

[tor-browser-bundle/master] Bump tags for Torbutton and update changelog.
by mikeperry＠torproject.org 16 Dec '13

16 Dec '13

commit f0b8f7f6f272cff976a6ce373d771e8ead7ed600 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Dec 16 15:05:52 2013 -0800 Bump tags for Torbutton and update changelog. Also tag the browser. --- Bundle-Data/Docs/ChangeLog.txt | 2 ++ gitian/versions | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 39b21a3..f1db50f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,6 +3,8 @@ Tor Browser Bundle 3.5 -- Dec 17 2013 * Update Tor to 0.2.4.19 * Update Tor Launcher to 0.2.4.2 * Bug 10382: Fix a Tor Launcher hang on TBB exit + * Update Torbutton to 1.6.5.2 + * Misc: Switch update download URL back to download-easy Tor Browser Bundle 3.5rc1 -- Dec 12 2013 * All Platforms diff --git a/gitian/versions b/gitian/versions index 0bda41d..43b0ff9 100755 --- a/gitian/versions +++ b/gitian/versions @@ -3,11 +3,11 @@ BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.2.0esr-3.5rc1-build3 +TORBROWSER_TAG=tor-browser-24.2.0esr-3.5-build1 TOR_TAG=tor-0.2.4.19 OPENSSL_TAG=openssl-101e-no-gmt-time-v1 TORLAUNCHER_TAG=0.2.4.2 -TORBUTTON_TAG=1.6.5.1 +TORBUTTON_TAG=1.6.5.2 HTTPSE_TAG=3.4.4tbb NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0

[torbutton/master] Switch the download page back to download-easy.
by mikeperry＠torproject.org 16 Dec '13

16 Dec '13

commit 5080bc7a60cbf284bae6a5b0b5ffc2359b092eee Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Dec 16 14:50:38 2013 -0800 Switch the download page back to download-easy. Also bump version and changelog entry. --- src/CHANGELOG | 4 ++++ src/chrome/content/torbutton.js | 3 +-- src/install.rdf | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index befcf4f..033e957 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.6.5.2: + 17 Dec 2013 + * Misc: Change the default update download link back to download-easy + 1.6.5.1: 10 Dec 2013 * Bug 10352: Clear FF24 Private Browsing Mode data during New Identity diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index b870048..6298e46 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -795,8 +795,7 @@ function torbutton_notify_if_update_needed() { } function torbutton_download_update() { - // XXX: We lack a download page for the alphas right now.. - var downloadURI = "https://blog.torproject.org/category/tags/tbb-30"; + var downloadURI = "https://www.torproject.org/download/download-easy.html"; var rtSvc = Components.classes["@mozilla.org/xre/app-info;1"] .getService(Components.interfaces.nsIXULRuntime); downloadURI += "?os=" + rtSvc.OS + "&arch=" + rtSvc.XPCOMABI; diff --git a/src/install.rdf b/src/install.rdf index 89163bb..cb3f359 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.1</em:version> + <em:version>1.6.5.2</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

[tor-browser-bundle/master] Arg. Cut and paste fail on changelog.
by mikeperry＠torproject.org 16 Dec '13

16 Dec '13

commit 8b431add14bcd9cdf901b3e9a89a7b13596b69a2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Dec 16 14:33:15 2013 -0800 Arg. Cut and paste fail on changelog. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3d43fad..39b21a3 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,6 @@ Tor Browser Bundle 3.5 -- Dec 17 2013 * All Platforms - * Update Tor to 0.2.4.18-rc + * Update Tor to 0.2.4.19 * Update Tor Launcher to 0.2.4.2 * Bug 10382: Fix a Tor Launcher hang on TBB exit

1 0

[tor-browser-bundle/master] Bump stable versions for TBB3.5.
by mikeperry＠torproject.org 16 Dec '13

16 Dec '13

commit 322d92715ed4f0935fe4244ab6ad51a2177f70f8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Dec 16 14:29:14 2013 -0800 Bump stable versions for TBB3.5. --- gitian/versions | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gitian/versions b/gitian/versions index 571b2d3..0bda41d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,23 +1,23 @@ -TORBROWSER_VERSION=3.0-rc-1 +TORBROWSER_VERSION=3.5 BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-17.0.11esr-3.0rc1-build2 -TOR_TAG=tor-0.2.4.18-rc +TORBROWSER_TAG=tor-browser-24.2.0esr-3.5rc1-build3 +TOR_TAG=tor-0.2.4.19 OPENSSL_TAG=openssl-101e-no-gmt-time-v1 -TORLAUNCHER_TAG=0.2.3.2-rc -TORBUTTON_TAG=1.6.4.1 -HTTPSE_TAG=3.4.2 +TORLAUNCHER_TAG=0.2.4.2 +TORBUTTON_TAG=1.6.5.1 +HTTPSE_TAG=3.4.4tbb NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_REV=5830 +MINGW_REV=6184 GITIAN_TAG=tor-browser-builder-3.0-4 # OPENSSL_VER=1.0.1e -FIREFOX_LANG_VER=17.0.11esr +FIREFOX_LANG_VER=24.2.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 @@ -25,7 +25,7 @@ PYTHON_VER=2.7.5 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.7-sm+fx+fn.xpi -TOOLCHAIN4_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz +TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll @@ -36,14 +36,14 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 +TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e -MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b +MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 ## Non-git package URLs # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} -TOOLCHAIN4_URL=https://mingw-and-ndk.googlecode.com/files/${TOOLCHAIN4_PACKAGE} +TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}

1 0

[tor-browser-bundle/master] Write changelog entry for TBB 3.5.
by mikeperry＠torproject.org 16 Dec '13

16 Dec '13

commit 6f11adea1cee8b8fab2a65d56986a70aa7fbda9b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Dec 16 14:31:21 2013 -0800 Write changelog entry for TBB 3.5. --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 8682921..3d43fad 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser Bundle 3.5 -- Dec 17 2013 + * All Platforms + * Update Tor to 0.2.4.18-rc + * Update Tor Launcher to 0.2.4.2 + * Bug 10382: Fix a Tor Launcher hang on TBB exit + Tor Browser Bundle 3.5rc1 -- Dec 12 2013 * All Platforms * Update Firefox to 24.2.0esr

1 0

[tor-launcher/master] Bump Tor Launcher version to 0.2.4.2.
by mikeperry＠torproject.org 16 Dec '13

16 Dec '13

commit 1e34dd95dc7f2d95d166a09f94f1bb58c8275b88 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Dec 16 14:25:30 2013 -0800 Bump Tor Launcher version to 0.2.4.2. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 660b4b9..840c522 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.4.1</em:version> + <em:version>0.2.4.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <!-- <em:optionsURL>chrome://torlauncher/content/preferences.xul</em:optionsURL>

1 0

r26480: {website} Adding tor ecosystem presentation to the volunteer page My T (in website/trunk: css getinvolved/en images)
by Damian Johnson 16 Dec '13

16 Dec '13

Author: atagar Date: 2013-12-16 17:25:57 +0000 (Mon, 16 Dec 2013) New Revision: 26480 Added: website/trunk/images/video.png Modified: website/trunk/css/layout.css website/trunk/getinvolved/en/volunteer.wml Log: Adding tor ecosystem presentation to the volunteer page My TA3M presentation covers most of the volunteer page's projects. Placing it here will give visitors an easier method to learn about our projects (rather than digging into a wall of text). This has the right proportions on my screen, but I'm not sure about other resolutions. Fingers crossed it looks ok elsewhere... Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2013-12-14 16:01:16 UTC (rev 26479) +++ website/trunk/css/layout.css 2013-12-16 17:25:57 UTC (rev 26480) @@ -428,6 +428,20 @@ padding: 6px; } +#ecosystem_presentation { + height: 30px; + padding-top: 10px; + padding-left: 60px; + vertical-align: middle; + background: url("../images/video.png") no-repeat scroll left center transparent; + font-size: 1.7em; + font-weight: bold; +} + +#ecosystem_presentation a { + text-decoration: none; +} + .project { float: left; padding: 6px; Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-12-14 16:01:16 UTC (rev 26479) +++ website/trunk/getinvolved/en/volunteer.wml 2013-12-16 17:25:57 UTC (rev 26480) @@ -104,6 +104,16 @@ aren't active at that moment. </p> + <p> + For a presentation summarizing many of these projects see... + </p> + + <div id="ecosystem_presentation"> + <a href="https://media.torproject.org/video/2013-11-t3am-damian-johnson.mp4">Tor Ecosystem</a> (<a href="https://svn.torproject.org/svn/projects/presentations/2013-11-t3am-tor-ecos…">slides</a>) + </div> + + <br /></br /> + <table id="projects"> <tr> <th>Name</th> Added: website/trunk/images/video.png =================================================================== (Binary files differ) Property changes on: website/trunk/images/video.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

[tor-cloud/master] How to update the Tor Cloud website
by runa＠torproject.org 16 Dec '13

16 Dec '13

commit ce98487e1174bff3a76c1f9f0327486b5be89a44 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Mon Dec 16 11:41:41 2013 -0500 How to update the Tor Cloud website --- to-update-the-website.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/to-update-the-website.txt b/to-update-the-website.txt new file mode 100644 index 0000000..14d2335 --- /dev/null +++ b/to-update-the-website.txt @@ -0,0 +1,11 @@ +To update the Tor Cloud website on https://cloud.torproject.org/: + +1. Clone this repository, update files in html/, commit and push. + +2. SSH to staticiforme via perdulce using the following command: + + $ ssh -o ProxyCommand='ssh perdulce.torproject.org -W %h:%p' staticiforme.torproject.org + +3. Run the following command to trigger a mirror update: + + $ sudo -u mirroradm static-master-update-component cloud.torproject.org

1 0

[tor-cloud/master] remove links to all instance images, except us-east-1 (re #10318)
by runa＠torproject.org 16 Dec '13

16 Dec '13

commit 69a29ac609a0bf42da7c620680402836aa4e6e09 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Mon Dec 16 10:33:07 2013 -0500 remove links to all instance images, except us-east-1 (re #10318) --- html/index.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/html/index.html b/html/index.html index 1c2053e..dca1e24 100644 --- a/html/index.html +++ b/html/index.html @@ -49,10 +49,10 @@ <li><a id="t2" href="#get_started">Get Started!</a></li> <li><a id="t3" href="#faq">FAQ</a></li> </ul> - </nav> + <h1 id="logo"><a href="/">Tor Cloud</a></h1> </div> </header> @@ -141,6 +141,7 @@ <br><h3>Obfsproxy Bridges (required ports: 22, 443, 40872, 52176)</h3> <ul class="region-nav"> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-4a7c…" target="_blank">us-east-1<br>Virginia</a></li> + </ul><br /><br /> <h3>Private Bridges (required ports: 22, 443, 40872, 52176)</h3> <ul class="region-nav"> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-567c…" target="_blank">us-east-1<br>Virginia</a></li> + </ul>

1 0