February 2015 - tor-commits - lists.torproject.org

[tor/maint-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 20 Feb '15

20 Feb '15

commit 1525eeeb49a4666069371a8300d6fa1c22c04de3 Merge: 7cbdec5 8e61d38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 20 01:04:26 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/ticket14487 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc src/or/config.c index 8921082,fde88ad..2a7237d --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,23 -794,23 +856,23 @@@ add_default_trusted_dir_authorities(dir "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", - "Tonga orport=443 bridge no-v2 82.94.251.203:80 " + "Tonga orport=443 bridge 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", - "gabelmoo orport=443 no-v2 " + "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", - "dannenberg orport=443 no-v2 " + "dannenberg orport=443 " "v3ident=585769C78764D58426B8B52B6651A5A71137189A " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " + "urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", - "maatuska orport=80 no-v2 " + "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", - "Faravahar orport=443 no-v2 " + "Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " - "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", + "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", - "longclaw orport=443 no-v2 " + "longclaw orport=443 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL

1 0

[tor/maint-0.2.4] Faravahar's New IP Address as of 2/20/2015
by nickm＠torproject.org 20 Feb '15

20 Feb '15

commit 8e61d38cf107560a55ebdb8397230f3d88548745 Author: Sina Rabbani <sina(a)redteam.net> Date: Fri Feb 13 09:47:43 2015 -0800 Faravahar's New IP Address as of 2/20/2015 --- changes/ticket14487 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/ticket14487 b/changes/ticket14487 new file mode 100644 index 0000000..577337f --- /dev/null +++ b/changes/ticket14487 @@ -0,0 +1,3 @@ + o Directory authority IP change: + - The directory authority Faravahar has a new IP address. Closes + ticket 14487. diff --git a/src/or/config.c b/src/or/config.c index 6a0d3da..fde88ad 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -809,7 +809,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", "Faravahar orport=443 no-v2 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " - "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", + "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", "longclaw orport=443 no-v2 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",

1 0

[tor-browser-bundle/master] Remove bug8405 backport. It is merged in Tor 0.2.6.3.
by mikeperry＠torproject.org 20 Feb '15

20 Feb '15

commit 438a412b0e834cf8455973255c0d3c243723e860 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 19 17:58:29 2015 -0800 Remove bug8405 backport. It is merged in Tor 0.2.6.3. --- gitian/descriptors/linux/gitian-tor.yml | 3 --- gitian/descriptors/mac/gitian-tor.yml | 3 --- gitian/descriptors/windows/gitian-tor.yml | 3 --- 3 files changed, 9 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 87f3f10..7338f2d 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -80,9 +80,6 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; - then - git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index a772a74..08408f8 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -58,9 +58,6 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; - then - git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 9cbbb86..7db511b 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -58,9 +58,6 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; - then - git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src

1 0

[tor-browser-spec/master] We can only use the rsync trick for a previous build of the same version.
by mikeperry＠torproject.org 20 Feb '15

20 Feb '15

commit c69378d7b2453e5eebf74f75ae8a2da1b4d88cbd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 19 16:08:10 2015 -0800 We can only use the rsync trick for a previous build of the same version. All of the file names have the version in them.. :/ --- processes/ReleaseProcess | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index abade44..61c44b7 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -33,7 +33,7 @@ echo $TORBROWSER_VERSION echo $TORBROWSER_BUILDDIR echo - echo 'You must still set $OLD_TORBROWSER_VERSION and $OLD_TORBROWSER_BUILDDIR!' + echo 'You must still set $OLD_TORBROWSER_VERSION' #. Push tag and version to tor-browser-bundle.git torsocks git push origin master:master @@ -59,7 +59,7 @@ chmod 644 $TORBROWSER_BUILDDIR/* #. (Optional): Upload your binaries to people using partial rsync over old version - torsocks ssh people.torproject.org "mv ~/public_html/builds/$OLD_TORBROWSER_BUILDDIR ~/public_html/builds/$TORBROWSER_BUILDDIR" + torsocks ssh people.torproject.org "mv ~/public_html/builds/${TORBROWSER_VERSION}-build1 ~/public_html/builds/$TORBROWSER_BUILDDIR" torsocks rsync -avP $TORBROWSER_BUILDDIR/ people.torproject.org:public_html/builds/$TORBROWSER_BUILDDIR #. Distribute build to tor-qa(a)lists.torproject.org

1 0

[tor-browser-bundle/master] Bump Tor Tag to 0.2.6.3-alpha and add to Changelog.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit defcd8d1c416804960662ea5548679d231f90984 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 19 15:33:04 2015 -0800 Bump Tor Tag to 0.2.6.3-alpha and add to Changelog. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5137372..5998b60 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,7 @@ Tor Browser 4.5a4 -- Feb 24 2015 * All Platforms * Update Firefox to 31.5.0esr + * Update Tor to 0.2.6.3-alpha * Update OpenSSL to 1.0.1l * Update NoScript to 2.6.9.14 * Update obfs4proxy to 0.0.4 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 8f6f915..1f8b145 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -9,7 +9,7 @@ FIREFOX_VERSION=31.5.0esr TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 -TOR_TAG=tor-0.2.6.2-alpha +TOR_TAG=tor-0.2.6.3-alpha TORLAUNCHER_TAG=0.2.7.2 TORBUTTON_TAG=1.9.0.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630

1 0

[tor-browser-spec/master] Bug 14221: Taking care of *build* directories
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit eab449ac811bdcb6166626343d9d9d26ce5a46bc Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 17 11:13:11 2015 +0000 Bug 14221: Taking care of *build* directories --- processes/ReleaseProcess | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 428b89c..c807508 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -66,18 +66,18 @@ #. Remote: # XXX: Be aware that this command would delete ALL Tor Browser 4.x.x versions! torsocks ssh staticiforme.torproject.org "rm -rf /srv/dist-master.torproject.org/htdocs/torbrowser/4.*" - torsocks rsync -avP $TORBROWSER_VERSION staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrows… + torsocks rsync -avP $TORBROWSER_VERSION-build1/ staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrows… torsocks ssh staticiforme.torproject.org "chmod g+w,o+r -R /srv/dist-master.torproject.org/htdocs/torbrowser/*" torsocks ssh staticiforme.torproject.org "static-update-component dist.torproject.org" #. Local to staticiforme: cd /tmp - wget -nH --cut-dirs=2 -r -l 1 https://people.torproject.org/~mikeperry/builds/$TORBROWSER_VERSION - rm $TORBROWSER_VERSION/index.html* + wget -nH --cut-dirs=2 -r -l 1 https://people.torproject.org/~mikeperry/builds/$TORBROWSER_VERSION-build1 + rm $TORBROWSER_VERSION-build1/index.html* # $OLD_TORBROWSER_VERSION is the value for exactly the one version that should # get superseded by $TORBROWSER_VERSION. rm -rf /srv/dist-master.torproject.org/htdocs/torbrowser/$OLD_TORBROWSER_VERSION cd /srv/dist-master.torproject.org/htdocs/torbrowser/ - mv /tmp/$TORBROWSER_VERSION . + mv /tmp/$TORBROWSER_VERSION-build1 $TORBROWSER_VERSION # We need to adjust permissions *after* we copied the new version to dist-master chmod 775 $TORBROWSER_VERSION chmod 664 $TORBROWSER_VERSION/*

1 0

[tor-browser-spec/master] We no longer have to specifically build+re-hash incrementals.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit ce3e9f9bccf479a17910264ce6801919a88839e2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 19 14:50:23 2015 -0800 We no longer have to specifically build+re-hash incrementals. --- processes/ReleaseProcess | 3 --- 1 file changed, 3 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 8fdaeb3..428b89c 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -39,9 +39,6 @@ #. Build: make - make incrementals - # XXX: it sucks to have to re-hash here - make hash make sign make match

1 0

[tor-browser-spec/master] Use $TORBROWSER_BUILDDIR instead of manual tag names.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit 0ba5d4675dcc47af39dc078e4b6b048f87d247d5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 19 15:25:26 2015 -0800 Use $TORBROWSER_BUILDDIR instead of manual tag names. Also clean up paths and other manual cruft. --- processes/ReleaseProcess | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index c807508..abade44 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -32,6 +32,8 @@ eval $( ./get-tb-version release ) # or alpha / beta echo $TORBROWSER_VERSION echo $TORBROWSER_BUILDDIR + echo + echo 'You must still set $OLD_TORBROWSER_VERSION and $OLD_TORBROWSER_BUILDDIR!' #. Push tag and version to tor-browser-bundle.git torsocks git push origin master:master @@ -44,43 +46,46 @@ #. Place all build signatures in the correct location and fix permissions source versions - for i in gk linus erinn mikeperry dcf + for i in gk linus mikeperry boklm do - if [ -d ${TORBROWSER_VERSION}/$i ]; then - if [ -f ${TORBROWSER_VERSION}/${i}/sha256sums.txt.asc ]; then - cp ${TORBROWSER_VERSION}/$i/sha256sums.txt.asc ${TORBROWSER_VERSION]/sha256sums.txt-${i}.asc + if [ -d ${TORBROWSER_BUILDDIR}/$i ]; then + if [ -f ${TORBROWSER_BUILDDIR}/${i}/sha256sums.txt.asc ]; then + cp ${TORBROWSER_BUILDDIR}/$i/sha256sums.txt.asc ${TORBROWSER_BUILDDIR}/sha256sums.txt-${i}.asc fi - rm -rf ${TORBROWSER_VERSION/$i + rm -rf ${TORBROWSER_BUILDDIR}/$i fi done - chmod 755 $TORBROWSER_VERSION - chmod 644 $TORBROWSER_VERSION/* + chmod 755 $TORBROWSER_BUILDDIR + chmod 644 $TORBROWSER_BUILDDIR/* + +#. (Optional): Upload your binaries to people using partial rsync over old version + torsocks ssh people.torproject.org "mv ~/public_html/builds/$OLD_TORBROWSER_BUILDDIR ~/public_html/builds/$TORBROWSER_BUILDDIR" + torsocks rsync -avP $TORBROWSER_BUILDDIR/ people.torproject.org:public_html/builds/$TORBROWSER_BUILDDIR #. Distribute build to tor-qa(a)lists.torproject.org #XXX: Currently manual #. Sign individual bundle files -# XXX: This blocks on Erinn currently. We use her key for file sigs +# XXX: Document this #. Clear out old builds, transfer builds to staticiforme #. Remote: -# XXX: Be aware that this command would delete ALL Tor Browser 4.x.x versions! - torsocks ssh staticiforme.torproject.org "rm -rf /srv/dist-master.torproject.org/htdocs/torbrowser/4.*" - torsocks rsync -avP $TORBROWSER_VERSION-build1/ staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrows… + torsocks ssh staticiforme.torproject.org "rm -rf /srv/dist-master.torproject.org/htdocs/torbrowser/$OLD_TORBROWSER_VERSION" + torsocks rsync -avP $TORBROWSER_BUILDDIR/ staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrows… torsocks ssh staticiforme.torproject.org "chmod g+w,o+r -R /srv/dist-master.torproject.org/htdocs/torbrowser/*" torsocks ssh staticiforme.torproject.org "static-update-component dist.torproject.org" #. Local to staticiforme: - cd /tmp - wget -nH --cut-dirs=2 -r -l 1 https://people.torproject.org/~mikeperry/builds/$TORBROWSER_VERSION-build1 - rm $TORBROWSER_VERSION-build1/index.html* -# $OLD_TORBROWSER_VERSION is the value for exactly the one version that should -# get superseded by $TORBROWSER_VERSION. + # XXX: Still requires $OLD_TORBROWSER_VERSION to be set manually + cd ~/tbb-builds/tor-browser-bundle/gitian + git pull origin + eval $( ./get-tb-version release ) # or alpha / beta + wget -nH --cut-dirs=2 -r -l 1 https://people.torproject.org/~mikeperry/builds/$TORBROWSER_BUILDDIR + rm $TORBROWSER_BUILDDIR/index.html* rm -rf /srv/dist-master.torproject.org/htdocs/torbrowser/$OLD_TORBROWSER_VERSION - cd /srv/dist-master.torproject.org/htdocs/torbrowser/ - mv /tmp/$TORBROWSER_VERSION-build1 $TORBROWSER_VERSION + mv $TORBROWSER_BUILDDIR /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION # We need to adjust permissions *after* we copied the new version to dist-master - chmod 775 $TORBROWSER_VERSION - chmod 664 $TORBROWSER_VERSION/* + chmod 775 /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION + chmod 664 /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION/* static-update-component dist.torproject.org #. Update website's torbrowser versions file in the website git

1 0

[tor/master] bump version to 0.2.6.3-alpha-dev
by nickm＠torproject.org 19 Feb '15

19 Feb '15

commit 5334bcd7e30d6247522f2d1154f0ceacc46fdc80 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 19 17:20:40 2015 -0500 bump version to 0.2.6.3-alpha-dev --- ChangeLog | 4 ++++ configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7edb114..4d93e19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Changes in version 0.2.6.4-?? - 2015-0?-?? + + + Changes in version 0.2.6.3-alpha - 2015-02-19 Tor 0.2.6.3-alpha is the third (and hopefully final) alpha release in the 0.2.6.x series. It introduces support for more kinds of sockets, diff --git a/configure.ac b/configure.ac index f762067..803ab3c 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.3-alpha]) +AC_INIT([tor],[0.2.6.3-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 43449dc..24757a8 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.3-alpha" +!define VERSION "0.2.6.3-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 d845654..e3a5205 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.3-alpha" +#define VERSION "0.2.6.3-alpha-dev"

1 0

[webwml/master] Bump dev version on website to 0.2.6.3-alpha
by nickm＠torproject.org 19 Feb '15

19 Feb '15

commit ef8833d744bacecd8397c0bd120d10cfbc9b1f67 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 19 17:18:26 2015 -0500 Bump dev version on website to 0.2.6.3-alpha --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d8dda85..7cc2fda 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.6.2-alpha +export DEVTAG=tor-0.2.6.3-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index 2c0d6ee..6d02728 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.6.2-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.6.3-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.5.10</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.5.10</define-tag>

1 0