September 2014 - tor-commits - lists.torproject.org

[obfs4/master] Change the default logLevel to ERROR, upgrade some client warnings.
by yawning＠torproject.org 03 Sep '14

03 Sep '14

commit ce86fa4348bdd436eed69fccae366e2980bd7b37 Author: Yawning Angel <yawning(a)torproject.org> Date: Wed Sep 3 12:50:43 2014 +0000 Change the default logLevel to ERROR, upgrade some client warnings. Client side logs are less spammy than server side in general, so more messages should be visible at the default logLevel when running as a client. Server side logging will be spammy basically no matter what unless obfs4proxy gets into the (arguably dangerous) business of figuring out which errors are people being evil vs which ones are transient network issues, so most logging is suppressed by default, unless the admin choses to open the floodgates. --- obfs4proxy/obfs4proxy.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index cf8043a..85817f0 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -188,7 +188,7 @@ func clientHandler(f base.ClientFactory, conn *pt.SocksConn, proxyURI *url.URL) // Deal with arguments. args, err := f.ParseArgs(&conn.Req.Args) if err != nil { - warnf("%s(%s) - invalid arguments: %s", name, addrStr, err) + errorf("%s(%s) - invalid arguments: %s", name, addrStr, err) conn.Reject() return } @@ -210,7 +210,7 @@ func clientHandler(f base.ClientFactory, conn *pt.SocksConn, proxyURI *url.URL) } remoteConn, err := dialFn("tcp", conn.Req.Target) // XXX: Allow UDP? if err != nil { - warnf("%s(%s) - outgoing connection failed: %s", name, addrStr, elideError(err)) + errorf("%s(%s) - outgoing connection failed: %s", name, addrStr, elideError(err)) conn.Reject() return } @@ -220,13 +220,13 @@ func clientHandler(f base.ClientFactory, conn *pt.SocksConn, proxyURI *url.URL) // bytes back and forth. remote, err := f.WrapConn(remoteConn, args) if err != nil { - warnf("%s(%s) - handshake failed: %s", name, addrStr, elideError(err)) + errorf("%s(%s) - handshake failed: %s", name, addrStr, elideError(err)) conn.Reject() return } err = conn.Grant(remoteConn.RemoteAddr().(*net.TCPAddr)) if err != nil { - warnf("%s(%s) - SOCKS grant failed: %s", name, addrStr, elideError(err)) + errorf("%s(%s) - SOCKS grant failed: %s", name, addrStr, elideError(err)) return } @@ -391,7 +391,7 @@ func main() { // Handle the command line arguments. _, execName := path.Split(os.Args[0]) showVer := flag.Bool("version", false, "Print version and exit") - logLevelStr := flag.String("logLevel", "WARN", "Log level (ERROR/WARN/INFO)") + logLevelStr := flag.String("logLevel", "ERROR", "Log level (ERROR/WARN/INFO)") flag.BoolVar(&enableLogging, "enableLogging", false, "Log to TOR_PT_STATE_LOCATION/"+obfs4proxyLogFile) flag.BoolVar(&unsafeLogging, "unsafeLogging", false, "Disable the address scrubber") flag.Parse()

1 0

[obfs4/master] Add a prolog/epilog to the logging that always gets logged.
by yawning＠torproject.org 03 Sep '14

03 Sep '14

commit fb13cf124149ebb94f400f718c9ae22dda341bdd Author: Yawning Angel <yawning(a)torproject.org> Date: Wed Sep 3 11:55:16 2014 +0000 Add a prolog/epilog to the logging that always gets logged. The prolog prints the version as soon as logging is enabled, but before the pluggable transport configuration is done. The epilog is printed as the code returns from main, as long as either client or server pt configuration succeded. --- obfs4proxy/log.go | 7 +++++++ obfs4proxy/obfs4proxy.go | 14 ++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/obfs4proxy/log.go b/obfs4proxy/log.go index 22f345c..5440596 100644 --- a/obfs4proxy/log.go +++ b/obfs4proxy/log.go @@ -41,6 +41,13 @@ const ( var logLevel = levelInfo +func noticef(format string, a ...interface{}) { + if enableLogging { + msg := fmt.Sprintf(format, a...) + log.Print("[NOTICE]: " + msg) + } +} + func errorf(format string, a ...interface{}) { if enableLogging && logLevel >= levelError { msg := fmt.Sprintf(format, a...) diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index 7e8aad0..cf8043a 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -383,9 +383,8 @@ func ptInitializeLogging(enable bool) error { return nil } -func version() { - fmt.Printf("obfs4proxy-%s\n", obfs4proxyVersion) - os.Exit(0) +func getVersion() string { + return fmt.Sprintf("obfs4proxy-%s", obfs4proxyVersion) } func main() { @@ -398,7 +397,8 @@ func main() { flag.Parse() if *showVer { - version() + fmt.Printf("%s\n", getVersion()) + os.Exit(0) } if err := setLogLevel(*logLevelStr); err != nil { log.Fatalf("[ERROR]: failed to set log level: %s", err) @@ -418,6 +418,8 @@ func main() { } if err = ptInitializeLogging(enableLogging); err != nil { log.Fatalf("[ERROR]: %s - failed to initialize logging", execName) + } else { + noticef("%s - launched", getVersion()) } if isClient { infof("%s - initializing client transport listeners", execName) @@ -432,9 +434,9 @@ func main() { os.Exit(-1) } - infof("%s - launched and accepting connections", execName) + infof("%s - accepting connections", execName) defer func() { - infof("%s - terminated", execName) + noticef("%s - terminated", execName) }() // At this point, the pt config protocol is finished, and incoming

1 0

[obfs4/master] Update the README.md (No functional changes).
by yawning＠torproject.org 03 Sep '14

03 Sep '14

commit 79e94103d6bf7685c78e991f0d1b93b0eecefa3d Author: Yawning Angel <yawning(a)torproject.org> Date: Wed Sep 3 09:44:18 2014 +0000 Update the README.md (No functional changes). --- README.md | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3ee9c0c..4ad8b5c 100644 --- a/README.md +++ b/README.md @@ -32,14 +32,56 @@ handshake variants without being obscenely slow is non-trivial. Build time library dependencies are handled by go get automatically but are listed for clarity. - * Go 1.2.0 or later. Debian stable packages Go 1.0.2 which is missing several - things obfs4 depends on like SHA256. + * Go 1.2.0 or later. Prior versions of Go 1.0.2 are missing certain important + parts of the runtime library like a SHA256 implementation. * go.crypto (https://code.google.com/p/go.crypto) * go.net (https://code.google.com/p/go.net) * ed25519/extra25519 (https://github.com/agl/ed25519/extra25519) * SipHash-2-4 (https://github.com/dchest/siphash) * goptlib (https://git.torproject.org/pluggable-transports/goptlib.git) +### Installation + +To build: +`go get git.torproject.org/pluggable-transports/obfs4.git/obfs4proxy` + +To install: +Copy `$GOPATH/bin/obfs4proxy` to a permanent location (Eg: `/usr/local/sbin`) + +Client side torrc configuration: +``` +ClientTransportPlugin obfs4 exec /usr/local/sbin/obfs4proxy +``` + +Bridge side torrc configuration: +``` +# Act as a bridge relay. +BridgeRelay 1 + +# Use obfs4proxy to provide the obfs4 protocol. +ServerTransportPlugin obfs4 exec /usr/local/sbin/obfs4proxy + +# (Optional) Listen on the specified address/port for obfs4 connections as +# opposed to picking a port automatically. +#ServerTransportListenAddr obfs4 0.0.0.0:443 +``` + +### Tips and tricks + + * On modern Linux systems it is possible to have obfs4proxy bind to reserved + ports (<=1024) even when not running as root by granting the + `CAP_NET_BIND_SERVICE` capability with setcap: + + `# setcap 'cap_net_bind_service=+ep' /usr/local/sbin/obfs4proxy` + + * obfs4proxy can also act as a obfs2 and obfs3 client or server. Adjust the + `ClientTransportPlugin` and `ServerTransportPlugin` lines in the torrc as + appropriate. + + * The autogenerated obfs4 bridge parameters are placed in + `DataDir/pt_state/obfs4_state.json`. An obfs4 bridge line requires the + `node-id`, `public-key` and `iat-mode` arguments. + ### Thanks * David Fifield for goptlib.

1 0

[obfs4/master] Change the version command line arg from `-v` to `-version`.
by yawning＠torproject.org 03 Sep '14

03 Sep '14

commit d5f59458fe26bedb058ec292647af96f715420b2 Author: Yawning Angel <yawning(a)torproject.org> Date: Wed Sep 3 09:09:13 2014 +0000 Change the version command line arg from `-v` to `-version`. For consistency with the rest of the arguments. --- obfs4proxy/obfs4proxy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index d36594b..7e8aad0 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -391,7 +391,7 @@ func version() { func main() { // Handle the command line arguments. _, execName := path.Split(os.Args[0]) - showVer := flag.Bool("v", false, "Print version and exit") + showVer := flag.Bool("version", false, "Print version and exit") logLevelStr := flag.String("logLevel", "WARN", "Log level (ERROR/WARN/INFO)") flag.BoolVar(&enableLogging, "enableLogging", false, "Log to TOR_PT_STATE_LOCATION/"+obfs4proxyLogFile) flag.BoolVar(&unsafeLogging, "unsafeLogging", false, "Disable the address scrubber")

1 0

[obfs4/master] Add support for "logLevel" to reduce log spam.
by yawning＠torproject.org 03 Sep '14

03 Sep '14

commit 25178c6a951eeb94c427a1a22f372473e41bea97 Author: Yawning Angel <yawning(a)torproject.org> Date: Wed Sep 3 09:05:18 2014 +0000 Add support for "logLevel" to reduce log spam. By default logging will be done at the "WARN" level. Fatal initialization errors will always be logged as long as logging is enabled regardless of logLevel. --- obfs4proxy/log.go | 81 ++++++++++++++++++++++++++++++++++++++++++++++ obfs4proxy/obfs4proxy.go | 42 +++++++++++++----------- 2 files changed, 104 insertions(+), 19 deletions(-) diff --git a/obfs4proxy/log.go b/obfs4proxy/log.go new file mode 100644 index 0000000..22f345c --- /dev/null +++ b/obfs4proxy/log.go @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org> + * All rights reserved. + * + * 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. + * + * 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 HOLDER 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. + */ + +package main + +import ( + "fmt" + "log" + "strings" +) + +const ( + levelError = iota + levelWarn + levelInfo +) + +var logLevel = levelInfo + +func errorf(format string, a ...interface{}) { + if enableLogging && logLevel >= levelError { + msg := fmt.Sprintf(format, a...) + log.Print("[ERROR]: " + msg) + } +} + +func warnf(format string, a ...interface{}) { + if enableLogging && logLevel >= levelWarn { + msg := fmt.Sprintf(format, a...) + log.Print("[WARN]: " + msg) + } +} + +func infof(format string, a ...interface{}) { + if enableLogging && logLevel >= levelInfo { + msg := fmt.Sprintf(format, a...) + log.Print("[INFO]: " + msg) + } +} + +func setLogLevel(logLevelStr string) error { + switch strings.ToUpper(logLevelStr) { + case "ERROR": + logLevel = levelError + + case "WARN": + logLevel = levelWarn + + case "INFO": + logLevel = levelInfo + + default: + return fmt.Errorf("invalid log level '%s'", logLevelStr) + } + + return nil +} diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index 8cb0cbf..d36594b 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -150,7 +150,7 @@ func clientSetup() (launched bool, listeners []net.Listener) { go clientAcceptLoop(f, ln, ptClientProxy) pt.Cmethod(name, ln.Version(), ln.Addr()) - log.Printf("[INFO]: %s - registered listener: %s", name, ln.Addr()) + infof("%s - registered listener: %s", name, ln.Addr()) listeners = append(listeners, ln) launched = true @@ -183,12 +183,12 @@ func clientHandler(f base.ClientFactory, conn *pt.SocksConn, proxyURI *url.URL) name := f.Transport().Name() addrStr := elideAddr(conn.Req.Target) - log.Printf("[INFO]: %s(%s) - new connection", name, addrStr) + infof("%s(%s) - new connection", name, addrStr) // Deal with arguments. args, err := f.ParseArgs(&conn.Req.Args) if err != nil { - log.Printf("[ERROR]: %s(%s) - invalid arguments: %s", name, addrStr, err) + warnf("%s(%s) - invalid arguments: %s", name, addrStr, err) conn.Reject() return } @@ -202,7 +202,7 @@ func clientHandler(f base.ClientFactory, conn *pt.SocksConn, proxyURI *url.URL) // the configuration phase. dialer, err := proxy.FromURL(proxyURI, proxy.Direct) if err != nil { - log.Printf("[ERROR]: %s(%s) - failed to obtain proxy dialer: %s", name, addrStr, elideError(err)) + errorf("%s(%s) - failed to obtain proxy dialer: %s", name, addrStr, elideError(err)) conn.Reject() return } @@ -210,7 +210,7 @@ func clientHandler(f base.ClientFactory, conn *pt.SocksConn, proxyURI *url.URL) } remoteConn, err := dialFn("tcp", conn.Req.Target) // XXX: Allow UDP? if err != nil { - log.Printf("[ERROR]: %s(%s) - outgoing connection failed: %s", name, addrStr, elideError(err)) + warnf("%s(%s) - outgoing connection failed: %s", name, addrStr, elideError(err)) conn.Reject() return } @@ -220,21 +220,21 @@ func clientHandler(f base.ClientFactory, conn *pt.SocksConn, proxyURI *url.URL) // bytes back and forth. remote, err := f.WrapConn(remoteConn, args) if err != nil { - log.Printf("[ERROR]: %s(%s) - handshake failed: %s", name, addrStr, elideError(err)) + warnf("%s(%s) - handshake failed: %s", name, addrStr, elideError(err)) conn.Reject() return } err = conn.Grant(remoteConn.RemoteAddr().(*net.TCPAddr)) if err != nil { - log.Printf("[ERROR]: %s(%s) - SOCKS grant failed: %s", name, addrStr, elideError(err)) + warnf("%s(%s) - SOCKS grant failed: %s", name, addrStr, elideError(err)) return } err = copyLoop(conn, remote) if err != nil { - log.Printf("[INFO]: %s(%s) - closed connection: %s", name, addrStr, elideError(err)) + warnf("%s(%s) - closed connection: %s", name, addrStr, elideError(err)) } else { - log.Printf("[INFO]: %s(%s) - closed connection", name, addrStr) + infof("%s(%s) - closed connection", name, addrStr) } return @@ -273,7 +273,7 @@ func serverSetup() (launched bool, listeners []net.Listener) { pt.SmethodArgs(name, ln.Addr(), nil) } - log.Printf("[INFO]: %s - registered listener: %s", name, elideAddr(ln.Addr().String())) + infof("%s - registered listener: %s", name, elideAddr(ln.Addr().String())) listeners = append(listeners, ln) launched = true @@ -306,28 +306,28 @@ func serverHandler(f base.ServerFactory, conn net.Conn, info *pt.ServerInfo) { name := f.Transport().Name() addrStr := elideAddr(conn.RemoteAddr().String()) - log.Printf("[INFO]: %s(%s) - new connection", name, addrStr) + infof("%s(%s) - new connection", name, addrStr) // Instantiate the server transport method and handshake. remote, err := f.WrapConn(conn) if err != nil { - log.Printf("[ERROR]: %s(%s) - handshake failed: %s", name, addrStr, elideError(err)) + warnf("%s(%s) - handshake failed: %s", name, addrStr, elideError(err)) return } // Connect to the orport. orConn, err := pt.DialOr(info, conn.RemoteAddr().String(), name) if err != nil { - log.Printf("[ERROR]: %s(%s) - failed to connect to ORPort: %s", name, addrStr, elideError(err)) + errorf("%s(%s) - failed to connect to ORPort: %s", name, addrStr, elideError(err)) return } defer orConn.Close() err = copyLoop(orConn, remote) if err != nil { - log.Printf("[INFO]: %s(%s) - closed connection: %s", name, addrStr, elideError(err)) + warnf("%s(%s) - closed connection: %s", name, addrStr, elideError(err)) } else { - log.Printf("[INFO]: %s(%s) - closed connection", name, addrStr) + infof("%s(%s) - closed connection", name, addrStr) } return @@ -392,6 +392,7 @@ func main() { // Handle the command line arguments. _, execName := path.Split(os.Args[0]) showVer := flag.Bool("v", false, "Print version and exit") + logLevelStr := flag.String("logLevel", "WARN", "Log level (ERROR/WARN/INFO)") flag.BoolVar(&enableLogging, "enableLogging", false, "Log to TOR_PT_STATE_LOCATION/"+obfs4proxyLogFile) flag.BoolVar(&unsafeLogging, "unsafeLogging", false, "Disable the address scrubber") flag.Parse() @@ -399,6 +400,9 @@ func main() { if *showVer { version() } + if err := setLogLevel(*logLevelStr); err != nil { + log.Fatalf("[ERROR]: failed to set log level: %s", err) + } // Determine if this is a client or server, initialize logging, and finish // the pt configuration. @@ -416,10 +420,10 @@ func main() { log.Fatalf("[ERROR]: %s - failed to initialize logging", execName) } if isClient { - log.Printf("[INFO]: %s - initializing client transport listeners", execName) + infof("%s - initializing client transport listeners", execName) launched, ptListeners = clientSetup() } else { - log.Printf("[INFO]: %s - initializing server transport listeners", execName) + infof("%s - initializing server transport listeners", execName) launched, ptListeners = serverSetup() } if !launched { @@ -428,9 +432,9 @@ func main() { os.Exit(-1) } - log.Printf("[INFO]: %s - launched and accepting connections", execName) + infof("%s - launched and accepting connections", execName) defer func() { - log.Printf("[INFO]: %s - terminated", execName) + infof("%s - terminated", execName) }() // At this point, the pt config protocol is finished, and incoming

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 03 Sep '14

03 Sep '14

commit 817e218765a4119cb88078dec2567ee2fa81bc49 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 3 08:46:02 2014 +0000 Update translations for tails-iuk_completed --- pl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl.po b/pl.po index 2798288..6c3d311 100644 --- a/pl.po +++ b/pl.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-08-31 15:23+0200\n" -"PO-Revision-Date: 2014-09-02 22:21+0000\n" +"PO-Revision-Date: 2014-09-03 08:26+0000\n" "Last-Translator: seb\n" "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 03 Sep '14

03 Sep '14

commit f4bb33efd48aa49f22ed0de7c152a952a9036ea3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 3 08:45:55 2014 +0000 Update translations for tails-iuk --- nn.po | 2 +- pl.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nn.po b/nn.po index 04d851b..42a1da2 100644 --- a/nn.po +++ b/nn.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-08-31 15:23+0200\n" -"PO-Revision-Date: 2014-09-02 15:41+0000\n" +"PO-Revision-Date: 2014-09-03 08:26+0000\n" "Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n" diff --git a/pl.po b/pl.po index 2798288..6c3d311 100644 --- a/pl.po +++ b/pl.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-08-31 15:23+0200\n" -"PO-Revision-Date: 2014-09-02 22:21+0000\n" +"PO-Revision-Date: 2014-09-03 08:26+0000\n" "Last-Translator: seb\n" "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n"

1 0

[tor-browser-spec/master] Update release process for new versions file and chmod fixes.
by mikeperry＠torproject.org 03 Sep '14

03 Sep '14

commit 8a511a1fef49f017b5170a3dc014cb0c381d86b1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Sep 3 00:19:29 2014 -0700 Update release process for new versions file and chmod fixes. --- processes/ReleaseProcess | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index a2a7a44..2a96f82 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -57,11 +57,11 @@ #. Local to vescum: cd tmp wget -nH --cut-dirs=2 -r -l 1 https://people.torproject.org/~mikeperry/builds/$TORBROWSER_VERSION - chmod 755 $TORBROWSER_VERSION - chmod 644 $TORBROWSER_VERSION/* + chmod 775 $TORBROWSER_VERSION + chmod 664 $TORBROWSER_VERSION/* rm $TORBROWSER_VERSION/index.html* rm -rf /srv/www-master.torproject.org/htdocs/dist/torbrowser/3.* - cp -a $TORBROWSER_VERSION /srv/www-master.torproject.org/htdocs/dist/torbrowser/ + cp -r $TORBROWSER_VERSION /srv/www-master.torproject.org/htdocs/dist/torbrowser/ /home/mirroradm/bin/trigger-mirrors #. Add $TORBROWSER_VERSION to recommended-versions file in torbrowser.git @@ -77,8 +77,8 @@ #. Update website's torbrowser versions file cd website torsocks svn up . - vim ./include/versions.wmi - torsocks svn commit include/versions.wmi -m "Bump TBB version" + vim ./include/versions.wmi ./projects/torbrowser/RecommendedTBBVersions + torsocks svn commit include/versions.wmi projects/torbrowser/RecommendedTBBVersions -m "Bump TBB version" ./publish cd .. @@ -87,14 +87,3 @@ # See https://blog.torproject.org/blog/tor-browser-352-released for now # Don't forget to link to Mozilla's security advisories if this is a security # update, or Nadim will yell at you. - -#. Remove old version from recommended-versions file in torbrowser.git - cd torbrowser - git checkout master - torsocks git pull origin - vim ./build-scripts/recommended-versions - git commit build-scripts/recommended-versions - torsocks git push origin master:master - cd .. - -

1 0

[bridgedb/develop] Bump Leekspin version to 1.0.0.
by isis＠torproject.org 03 Sep '14

03 Sep '14

commit fe3967b8dbe9b61ed4bec6dd3662d61da314c607 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Sep 3 06:57:20 2014 +0000 Bump Leekspin version to 1.0.0. --- .test.requirements.txt | 2 +- .travis.requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.test.requirements.txt b/.test.requirements.txt index f1f85ab..ca2c01c 100644 --- a/.test.requirements.txt +++ b/.test.requirements.txt @@ -6,7 +6,7 @@ # $ make coverage # coverage==3.7.1 -leekspin==0.2.1 +leekspin==1.0.0 mechanize==0.2.5 pep8==1.5.7 # pylint must be pinned until pylint bug #203 is fixed. See diff --git a/.travis.requirements.txt b/.travis.requirements.txt index b84396b..b10bae4 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -15,7 +15,7 @@ #------------------------------------------------------------------------------ coverage==3.7.1 coveralls==0.4.2 -leekspin==0.2.1 +leekspin==1.0.0 mechanize==0.2.5 pep8==1.5.7 # pylint must be pinned until pylint bug #203 is fixed. See diff --git a/setup.py b/setup.py index e3463c9..47a2cbf 100644 --- a/setup.py +++ b/setup.py @@ -285,7 +285,7 @@ setuptools.setup( scripts=['scripts/bridgedb'], extras_require={'test': ["sure==1.2.2", "coverage==3.7.1", - "leekspin==0.2.1"]}, + "leekspin==1.0.0"]}, zip_safe=False, cmdclass=get_cmdclass(), include_package_data=True,

1 0

[bridgedb/develop] Update Sphinx refs for params in bridgedb.configure.loadConfig().
by isis＠torproject.org 03 Sep '14

03 Sep '14

commit efdc3ae5ba9414b620e7f5700831a9e302f21e84 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Aug 29 00:13:49 2014 +0000 Update Sphinx refs for params in bridgedb.configure.loadConfig(). --- lib/bridgedb/configure.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py index 33cc458..731b599 100644 --- a/lib/bridgedb/configure.py +++ b/lib/bridgedb/configure.py @@ -49,13 +49,13 @@ def loadConfig(configFile=None, configCls=None): then it's the first time this function has been called and it is therefore not safe to make calls to the logging module. :type: configFile: string or None - :param string configFile: If given, the filename of the config file to - load. - :type configCls: :class:`bridgedb.Main.Conf` or None - :param configCls: The current configuration, if one already exists. - :rtype: :class:`Conf` - :returns: A new configuration, with the old settings as defaults, and the - settings from the config file overriding them. + :param configFile: If given, the filename of the config file to load. + :type configCls: :class:`Conf` or None + :param configCls: The current configuration instance, if one already + exists. + :returns: A new :class:`configuration <bridgedb.configure.Conf>`, with the + old settings as defaults, and the settings from the **configFile** (if + given) overriding those defaults. """ itsSafeToUseLogging = False configuration = {}

1 0