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

[tor-browser-bundle/master] Merge remote-tracking branch 'tjr/tjr-64bit'
by mikeperry＠torproject.org 30 Oct '14

30 Oct '14

commit 912a8305b26ce0b1cbc80c4014b4de3ada898991 Merge: af7bd8e f1f4a2a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 29 15:14:09 2014 -0700 Merge remote-tracking branch 'tjr/tjr-64bit' Conflicts: gitian/descriptors/mac/gitian-pluggable-transports.yml Bundle-Data/mac-tor.sh | 1 - gitian/descriptors/mac/gitian-bundle.yml | 9 +++----- gitian/descriptors/mac/gitian-firefox.yml | 3 --- .../mac/gitian-pluggable-transports.yml | 16 ++++++------- gitian/descriptors/mac/gitian-tor.yml | 16 ++++++------- gitian/descriptors/mac/gitian-utils.yml | 16 +++++++------ gitian/mkbundle-mac.sh | 24 ++++++++++---------- 7 files changed, 40 insertions(+), 45 deletions(-) diff --cc gitian/descriptors/mac/gitian-pluggable-transports.yml index 4c25f07,17aef86..6201230 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@@ -48,10 -42,8 +48,10 @@@ files - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" - - "gmp-mac32-utils.zip" - - "openssl-mac32-utils.zip" +- "go.crypto.tar.bz2" +- "go.net.tar.bz2" + - "gmp-mac64-utils.zip" + - "openssl-mac64-utils.zip" script: | INSTDIR="$HOME/install" TBDIR="$INSTDIR/TorBrowserBundle.app/TorBrowser" @@@ -253,53 -245,7 +253,53 @@@ cp -a README doc/*.1 $TBDIR/Docs/meek cd .. + # Building go ed25519 + cd ed25519 + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/github.com/agl/" + ln -sf "$PWD" "$GOPATH/src/github.com/agl/ed25519" + go install github.com/agl/ed25519/extra25519 + cd .. + + # Building go siphash + cd siphash + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/github.com/dchest/" + ln -sf "$PWD" "$GOPATH/src/github.com/dchest/siphash" + go install github.com/dchest/siphash + cd .. + + # Building go.crypto + tar xjf go.crypto.tar.bz2 + cd go.crypto + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/code.google.com/p/" + ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.crypto" + go install code.google.com/p/go.crypto/curve25519 + go install code.google.com/p/go.crypto/hkdf + go install code.google.com/p/go.crypto/nacl/secretbox + cd .. + + # Building go.net + tar xjf go.net.tar.bz2 + cd go.net + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/code.google.com/p/" + ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.net" + go install code.google.com/p/go.net/proxy + cd .. + + # Building obfs4proxy + cd obfs4 + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" + ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" + cd obfs4proxy + go build -ldflags '-s' + cp -a obfs4proxy $PTDIR + cd ../.. + # Grabbing the result cd $INSTDIR - ~/build/dzip.sh pluggable-transports-mac$GBUILD_BITS-gbuilt.zip TorBrowserBundle.app - cp pluggable-transports-mac$GBUILD_BITS-gbuilt.zip $OUTDIR/ + ~/build/dzip.sh pluggable-transports-mac64-gbuilt.zip TorBrowserBundle.app + cp pluggable-transports-mac64-gbuilt.zip $OUTDIR/

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'origin/master'
by mikeperry＠torproject.org 30 Oct '14

30 Oct '14

commit ab8da1c4a840f30f37873132258edc3f9711554b Merge: 912a830 9f0cacb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 30 13:47:37 2014 -0700 Merge remote-tracking branch 'origin/master' gitian/versions.alpha | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/master] New empty changelog section
by nickm＠torproject.org 30 Oct '14

30 Oct '14

commit 0799f6f2cae413470ba8d4db7ba05742a755b48b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 30 13:56:36 2014 -0400 New empty changelog section --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4f3b230..f40feed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Changes in version 0.2.6.2-alpha - 2014-1?-?? + + Changes in version 0.2.6.1-alpha - 2014-10-30 Tor 0.2.6.1-alpha is the first release in the Tor 0.2.6.x series. It includes numerous code cleanups and new tests, and fixes a large

1 0

[tor/master] Bump version to 0.2.6.1-alpha-dev
by nickm＠torproject.org 30 Oct '14

30 Oct '14

commit 98ac48785bdb1eb1f47c9892c0d1556235424b8d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 30 10:25:24 2014 -0400 Bump version to 0.2.6.1-alpha-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c03d046..e7560b2 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2014, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.1-alpha]) +AC_INIT([tor],[0.2.6.1-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index a616514..d675c2c 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.6.1-alpha" +!define VERSION "0.2.6.1-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index af1787b..cee81b3 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.1-alpha" +#define VERSION "0.2.6.1-alpha-dev"

1 0

[webwml/master] Bump alpha versio to 0.2.6.1-alpha
by nickm＠torproject.org 30 Oct '14

30 Oct '14

commit afe581393eb42b97cd1c16bc290d9045902a9322 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 30 10:13:48 2014 -0400 Bump alpha versio to 0.2.6.1-alpha --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c4b5245..77e3bbc 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.2.5.10 -export DEVTAG=tor-0.2.5.10 +export DEVTAG=tor-0.2.6.1-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index 4c8cd2e..ed2f305 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.5.10</define-tag> -<define-tag version-alpha whitespace=delete>0.2.5.10</define-tag> +<define-tag version-alpha whitespace=delete>0.2.6.1-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.4.23</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.4.23</define-tag>

1 0

[tor/master] Clarify 13476 changelog (From sebastian)
by nickm＠torproject.org 30 Oct '14

30 Oct '14

commit 5a601dd2901644a537621f407f072d634ece2cfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 30 09:56:40 2014 -0400 Clarify 13476 changelog (From sebastian) --- ChangeLog | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00a3e9c..4f3b230 100644 --- a/ChangeLog +++ b/ChangeLog @@ -142,9 +142,11 @@ Changes in version 0.2.6.1-alpha - 2014-10-30 - Check all date/time values passed to tor_timegm and parse_rfc1123_time for validity, taking leap years into account. Improves HTTP header validation. Implemented with bug 13476. - - Clamp year values returned by system localtime(_r) and gmtime(_r) - to year 1 in correct_tm. This ensures tor can read any values it - writes out. Fixes bug 13476. + - In correct_tm(), limit the range of values returned by system + localtime(_r) and gmtime(_r) to be between the years 1 and 8099. + This means we don't have to deal with negative or too large dates, + even if a clock is wrong. Otherwise we might fail to read a file + written by us which includes such a date. Fixes bug 13476. o Minor bugfixes (bridge clients): - When configured to use a bridge without an identity digest (not

1 0

[tor/master] Fix a typo in the ChangeLog, spotted by Yawning
by nickm＠torproject.org 30 Oct '14

30 Oct '14

commit b46259e368fcdb0b4c30aefc5fd14a6af1282131 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 30 09:52:36 2014 -0400 Fix a typo in the ChangeLog, spotted by Yawning --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f7537f2..00a3e9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,7 @@ Changes in version 0.2.6.1-alpha - 2014-10-30 includes numerous code cleanups and new tests, and fixes a large number of annoying bugs. Out-of-memory conditions are handled better than in 0.2.5, pluggable transports have improved proxy support, and - clients how use optimistic data for contacting hidden services. Also, + clients now use optimistic data for contacting hidden services. Also, we are now more robust to changes in what we consider a parseable directory object, so that tightening restrictions does not have a risk of introducing infinite download loops.

1 0

[tor/master] Final(?) tweaks to 0.2.6.1-alpha changelog
by nickm＠torproject.org 30 Oct '14

30 Oct '14

commit ffe10d01d16041ea6d159fe156668c71d7ca8a7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 30 08:54:44 2014 -0400 Final(?) tweaks to 0.2.6.1-alpha changelog --- ChangeLog | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 381d2a6..f7537f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.6.1-alpha - 2014-??-?? +Changes in version 0.2.6.1-alpha - 2014-10-30 Tor 0.2.6.1-alpha is the first release in the Tor 0.2.6.x series. It includes numerous code cleanups and new tests, and fixes a large number of annoying bugs. Out-of-memory conditions are handled better @@ -8,6 +8,10 @@ Changes in version 0.2.6.1-alpha - 2014-??-?? directory object, so that tightening restrictions does not have a risk of introducing infinite download loops. + This is the first alpha release in a new series, so expect there to be + bugs. Users who would rather test out a more stable branch should stay + with 0.2.5.x for now. + o New compiler and system requirements: - Tor 0.2.6.x requires that your compiler support more of the C99 language standard than before. The 'configure' script now detects @@ -17,7 +21,6 @@ Changes in version 0.2.6.1-alpha - 2014-??-?? We may revisit this requirement if it turns out that a significant number of people need to build Tor with compilers that don't bother implementing a 15-year-old standard. Closes ticket 13233. - - Tor no longer supports systems without threading support. When we began working on Tor, there were several systems that didn't have threads, or where the thread support wasn't able to run the @@ -32,8 +35,9 @@ Changes in version 0.2.6.1-alpha - 2014-??-?? o Major features (bridges): - Expose the outgoing upstream HTTP/SOCKS proxy to pluggable - transports if they are configured via the "TOR_PT_PROXY" environment - variable. Implements proposal 232. Resolves ticket 8402. + transports if they are configured via the "TOR_PT_PROXY" + environment variable. Implements proposal 232. Resolves + ticket 8402. o Major features (client performance, hidden services): - Allow clients to use optimistic data when connecting to a hidden @@ -79,8 +83,8 @@ Changes in version 0.2.6.1-alpha - 2014-??-?? o Minor features: - When identity keypair is generated for first time, log a - congratulatory message that points to the new relay lifecycle - document on the wiki. Implements feature 10427. + congratulatory message that links to the new relay lifecycle + document. Implements feature 10427. o Minor features (client): - Clients are now willing to send optimistic data (before they

1 0

[tor/master] Bump version to 0.2.6.1-alpha
by nickm＠torproject.org 30 Oct '14

30 Oct '14

commit d8ced3b473e90489fafe14948fb1a66f6a5c60fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 30 08:58:58 2014 -0400 Bump version to 0.2.6.1-alpha --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f162e60..c03d046 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2014, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.0-alpha-dev]) +AC_INIT([tor],[0.2.6.1-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index f5c02db..a616514 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.6.0-alpha-dev" +!define VERSION "0.2.6.1-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 01f1307..af1787b 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.0-alpha-dev" +#define VERSION "0.2.6.1-alpha"

1 0

[tor-browser-bundle/master] Bump obfs4 related tags/commits for 4.5-alpha.
by gk＠torproject.org 30 Oct '14

30 Oct '14

commit 9f0cacb1cf6a075e91e4da1a4f56d31cd30b33cf Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 30 13:56:04 2014 +0000 Bump obfs4 related tags/commits for 4.5-alpha. --- gitian/versions.alpha | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6c49137..c4b65c3 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -27,6 +27,9 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.11 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 +GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de +GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd +OBFS4_TAG=0.0.3 GITIAN_TAG=tor-browser-builder-3.x-7

1 0