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

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 14 Nov '13

14 Nov '13

commit 9a4b8ef1630647498e05f07c43d6cad3a7b6f3be Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 14 19:16:01 2013 +0000 Update translations for liveusb-creator --- sv/sv.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 5967999..b571f68 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-12 13:29+0100\n" -"PO-Revision-Date: 2013-11-13 09:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-11-14 19:11+0000\n" +"Last-Translator: WinterFairy <winterfairy(a)riseup.net>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +34,7 @@ msgstr "%(filename)s vald" #: ../liveusb/gui.py:437 #, python-format msgid "%(size)s %(label)s" -msgstr "" +msgstr "%(size)s %(label)s" #: ../liveusb/gui.py:443 #, python-format @@ -71,7 +71,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopiera den aktuella Tails versionen till en redan installerad Tails enhet. Andra partitioner på enheten kommer att behållas.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopiera den aktuella Tails versionen till en redan installerad Tails enhet. Andra partitioner på enheten kommer att bevaras.</span></p></body></html>" #: ../liveusb/launcher_ui.py:164 msgid "" @@ -204,7 +204,7 @@ msgstr "Om du inte väljer en existerande Live ISO kommer den valda utgåvan att #: ../liveusb/dialog.py:174 msgid "Install Tails" -msgstr "" +msgstr "Installera Tails" #: ../liveusb/gui.py:628 msgid "Installation complete!" @@ -338,7 +338,7 @@ msgstr "Målenhet" msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." -msgstr "" +msgstr "Master Boot Record på din enhet är blank. MBR på denna enhet kommer att nollställas när du trycker på 'Installera Tails'." #: ../liveusb/gui.py:795 msgid "" @@ -560,7 +560,7 @@ msgstr "Skrev till enheten med %(speed)d MB/sek" msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" -msgstr "" +msgstr "Du är på väg att installera Tails på enheten %(size)s %(vendor)s %(model)s (%(device)s). All data på den valda enheten kommer att gå förlorad. Vill du fortsätta?" #: ../liveusb/gui.py:718 #, python-format @@ -568,7 +568,7 @@ msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " "device (%(device)s). Any persistent volume on this device will remain " "unchanged. Continue?" -msgstr "" +msgstr "Du är på väg att uppgradera Tails på enheten %(parent_size)s %(vendor)s %(model)s (%(device)s). Eventuell bestående lagring på den här enheten kommer behållas oförändrad. Vill du fortsätta?" #: ../liveusb/creator.py:607 msgid ""

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 14 Nov '13

14 Nov '13

commit be4371c28263640277972e8df84ab05abd776a93 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 14 19:15:58 2013 +0000 Update translations for https_everywhere_completed --- sv/https-everywhere.dtd | 4 ++++ sv/https-everywhere.properties | 1 + 2 files changed, 5 insertions(+) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index 9e40c7c..c00f068 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -40,3 +40,7 @@ <!ENTITY https-everywhere.popup.paragraph3 "Vi är tacksamma om du fortsatte att använda vår utvecklingsutgåva och hjälpte till att göra HTTPS Everywhere bättre! Det händer att där är lite fler buggar här och var, vilka du kan anmäla till https-everywhere(a)eff.org. Vi ber om ursäkt för besväret, och tack för att du använder HTTPS Everywhere."> <!ENTITY https-everywhere.popup.keep "Fortsätt använda utvecklingsversionen"> <!ENTITY https-everywhere.popup.revert "Ladda ner den senaste stabila versionen"> + +<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere regeltester"> +<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Avbryt"> +<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start"> diff --git a/sv/https-everywhere.properties b/sv/https-everywhere.properties index 941ba32..ad261e3 100644 --- a/sv/https-everywhere.properties +++ b/sv/https-everywhere.properties @@ -5,3 +5,4 @@ https-everywhere.menu.noRules = (Inga regler för denna sida) https-everywhere.menu.unknownRules = (Regler för denna sida okänt) https-everywhere.toolbar.hint = HTTPS Everywhere är nu aktiv. Du kan inaktivera den för enstaka sidor genom att klicka på ikonen i adressfältet. https-everywhere.migration.notification0 = För att verkställa en viktig uppdatering kommer dina regelinställningar för HTTPS Everywhere att återställas till sina standardvärden. +https-everywhere.menu.ruleset-tests = Kör HTTPS Everywhere regeltester

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 14 Nov '13

14 Nov '13

commit 352e7489471bc980e4e3cd6125eb32ca7394581f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 14 19:15:53 2013 +0000 Update translations for https_everywhere --- sv/https-everywhere.dtd | 2 +- sv/https-everywhere.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index afc7741..c00f068 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -41,6 +41,6 @@ <!ENTITY https-everywhere.popup.keep "Fortsätt använda utvecklingsversionen"> <!ENTITY https-everywhere.popup.revert "Ladda ner den senaste stabila versionen"> -<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests"> +<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere regeltester"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Avbryt"> <!ENTITY https-everywhere.ruleset-tests.status_start_button "Start"> diff --git a/sv/https-everywhere.properties b/sv/https-everywhere.properties index 895c1d7..ad261e3 100644 --- a/sv/https-everywhere.properties +++ b/sv/https-everywhere.properties @@ -5,4 +5,4 @@ https-everywhere.menu.noRules = (Inga regler för denna sida) https-everywhere.menu.unknownRules = (Regler för denna sida okänt) https-everywhere.toolbar.hint = HTTPS Everywhere är nu aktiv. Du kan inaktivera den för enstaka sidor genom att klicka på ikonen i adressfältet. https-everywhere.migration.notification0 = För att verkställa en viktig uppdatering kommer dina regelinställningar för HTTPS Everywhere att återställas till sina standardvärden. -# https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests +https-everywhere.menu.ruleset-tests = Kör HTTPS Everywhere regeltester

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 14 Nov '13

14 Nov '13

1 0

[torbrowser/maint-2.4] bump versions for new Firefox 17.0.11esr
by erinn＠torproject.org 14 Nov '13

14 Nov '13

commit aed454baeb9af6974172486802e93fcad8e3a94f Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 14 16:27:55 2013 -0200 bump versions for new Firefox 17.0.11esr --- README.LINUX-2.3 | 4 ++-- README.LINUX-2.4 | 4 ++-- README.OSX-2.3 | 4 ++-- README.OSX-2.4 | 4 ++-- README.WIN-2.3 | 4 ++-- README.WIN-2.4 | 4 ++-- build-scripts/linux-alpha.mk | 2 +- build-scripts/linux.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions-alpha.mk | 4 ++-- build-scripts/versions.mk | 4 ++-- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index d602e6d..d284747 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.10esr +Firefox 17.0.11esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.8.4 + |_ NoScript 2.6.8.5 |_ HTTPS-Everywhere 3.4.2 Usage diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index 3b1baf3..d5ba381 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.10esr +Firefox 17.0.11esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.8.4 + |_ NoScript 2.6.8.5 |_ HTTPS-Everywhere 3.4.2 |_ PDF Viewer 0.8.298 diff --git a/README.OSX-2.3 b/README.OSX-2.3 index c279ed7..8a7e421 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.10esr +Firefox 17.0.11esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.8.4 + |_ NoScript 2.6.8.5 |_ HTTPS-Everywhere 3.4.2 Usage diff --git a/README.OSX-2.4 b/README.OSX-2.4 index d395338..59b1a2d 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.10esr +Firefox 17.0.11esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.8.4 + |_ NoScript 2.6.8.5 |_ HTTPS-Everywhere 3.4.2 |_ PDF Viewer 0.8.298 diff --git a/README.WIN-2.3 b/README.WIN-2.3 index d7b257d..ea3cd75 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.10esr +Firefox 17.0.11esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.8.4 + |_ NoScript 2.6.8.5 |_ HTTPS-Everywhere 3.4.2 Usage diff --git a/README.WIN-2.4 b/README.WIN-2.4 index f76f48f..281e8b3 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.10esr +Firefox 17.0.11esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.8.4 + |_ NoScript 2.6.8.5 |_ HTTPS-Everywhere 3.4.2 |_ PDF Viewer 0.8.298 diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index bb459b6..b23c8db 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 0f62c21..52e6c3b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=14 +BUILD_NUM=15 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 7ad744d..1429c5b 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index b68c3c4..898a040 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=14 +BUILD_NUM=15 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index ac78816..612b16e 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -10,10 +10,10 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.4.17-rc PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.10esr +FIREFOX_VER=17.0.11esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.7.1 +NOSCRIPT_VER=2.6.8.5 HTTPSEVERYWHERE_VER=3.4.2 PDFJS_VER=0.8.298 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 28861e0..77275b8 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,10 +10,10 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.3.25 PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.10esr +FIREFOX_VER=17.0.11esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.8.4 +NOSCRIPT_VER=2.6.8.5 HTTPSEVERYWHERE_VER=3.4.2 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index fb41715..b8cdd2a 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index b5b9e50..f0174b3 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=14 +BUILD_NUM=15 PLATFORM=Windows ## Location of required libraries

1 0

[torbrowser/master] bump versions for new Firefox 17.0.11esr
by erinn＠torproject.org 14 Nov '13

14 Nov '13

commit aed454baeb9af6974172486802e93fcad8e3a94f Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 14 16:27:55 2013 -0200 bump versions for new Firefox 17.0.11esr --- README.LINUX-2.3 | 4 ++-- README.LINUX-2.4 | 4 ++-- README.OSX-2.3 | 4 ++-- README.OSX-2.4 | 4 ++-- README.WIN-2.3 | 4 ++-- README.WIN-2.4 | 4 ++-- build-scripts/linux-alpha.mk | 2 +- build-scripts/linux.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions-alpha.mk | 4 ++-- build-scripts/versions.mk | 4 ++-- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index d602e6d..d284747 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.10esr +Firefox 17.0.11esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.8.4 + |_ NoScript 2.6.8.5 |_ HTTPS-Everywhere 3.4.2 Usage diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index 3b1baf3..d5ba381 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.10esr +Firefox 17.0.11esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.8.4 + |_ NoScript 2.6.8.5 |_ HTTPS-Everywhere 3.4.2 |_ PDF Viewer 0.8.298 diff --git a/README.OSX-2.3 b/README.OSX-2.3 index c279ed7..8a7e421 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.10esr +Firefox 17.0.11esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.8.4 + |_ NoScript 2.6.8.5 |_ HTTPS-Everywhere 3.4.2 Usage diff --git a/README.OSX-2.4 b/README.OSX-2.4 index d395338..59b1a2d 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.10esr +Firefox 17.0.11esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.8.4 + |_ NoScript 2.6.8.5 |_ HTTPS-Everywhere 3.4.2 |_ PDF Viewer 0.8.298 diff --git a/README.WIN-2.3 b/README.WIN-2.3 index d7b257d..ea3cd75 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.10esr +Firefox 17.0.11esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.8.4 + |_ NoScript 2.6.8.5 |_ HTTPS-Everywhere 3.4.2 Usage diff --git a/README.WIN-2.4 b/README.WIN-2.4 index f76f48f..281e8b3 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.10esr +Firefox 17.0.11esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.8.4 + |_ NoScript 2.6.8.5 |_ HTTPS-Everywhere 3.4.2 |_ PDF Viewer 0.8.298 diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index bb459b6..b23c8db 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 0f62c21..52e6c3b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=14 +BUILD_NUM=15 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 7ad744d..1429c5b 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index b68c3c4..898a040 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=14 +BUILD_NUM=15 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index ac78816..612b16e 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -10,10 +10,10 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.4.17-rc PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.10esr +FIREFOX_VER=17.0.11esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.7.1 +NOSCRIPT_VER=2.6.8.5 HTTPSEVERYWHERE_VER=3.4.2 PDFJS_VER=0.8.298 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 28861e0..77275b8 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,10 +10,10 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.3.25 PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.10esr +FIREFOX_VER=17.0.11esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.8.4 +NOSCRIPT_VER=2.6.8.5 HTTPSEVERYWHERE_VER=3.4.2 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index fb41715..b8cdd2a 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index b5b9e50..f0174b3 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=14 +BUILD_NUM=15 PLATFORM=Windows ## Location of required libraries

1 0

[torspec/master] Mark proposal 217 finished. Still needs merging into spec
by nickm＠torproject.org 14 Nov '13

14 Nov '13

commit 74c3e4011a668700ecadaad1c47814009bb264e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 14 12:27:25 2013 -0500 Mark proposal 217 finished. Still needs merging into spec --- proposals/000-index.txt | 4 ++-- proposals/217-ext-orport-auth.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 1f84b47..fcdbb55 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -137,7 +137,7 @@ Proposals by number: 214 Allow 4-byte circuit IDs in a new link protocol [CLOSED] 215 Let the minimum consensus method change with time [OPEN] 216 Improved circuit-creation key exchange [CLOSED] -217 Tor Extended ORPort Authentication [OPEN] +217 Tor Extended ORPort Authentication [FINISHED] 218 Controller events to better understand connection/circuit usage [CLOSED] 219 Support for full DNS and DNSSEC resolution in Tor [DRAFT] 220 Migrate server identity keys to Ed25519 [DRAFT] @@ -188,7 +188,6 @@ Proposals by status: 211 Internal Mapaddress for Tor Configuration Testing [for 0.2.4.x+] 212 Increase Acceptable Consensus Age [for 0.2.4.x+] 215 Let the minimum consensus method change with time - 217 Tor Extended ORPort Authentication [for 0.2.5.x] ACCEPTED: 140 Provide diffs between consensuses 147 Eliminate the need for v2 directories in generating v3 directories [for 0.2.4.x] @@ -209,6 +208,7 @@ Proposals by status: 161 Computing Bandwidth Adjustments [for 0.2.1.x] 162 Publish the consensus in multiple flavors [in 0.2.3.1-alpha] 204 Subdomain support for Hidden Service addresses + 217 Tor Extended ORPort Authentication [for 0.2.5.x] CLOSED: 101 Voting on the Tor Directory System [in 0.2.0.x] 102 Dropping "opt" from the directory format [in 0.2.0.x] diff --git a/proposals/217-ext-orport-auth.txt b/proposals/217-ext-orport-auth.txt index 1206234..1305276 100644 --- a/proposals/217-ext-orport-auth.txt +++ b/proposals/217-ext-orport-auth.txt @@ -2,7 +2,7 @@ Filename: 217-ext-orport-auth.txt Title: Tor Extended ORPort Authentication Author: George Kadianakis Created: 28-11-2012 -Status: Open +Status: Finished Target: 0.2.5.x 1. Overview

1 0

[torspec/master] Mark proposal 146 superseded by 206
by nickm＠torproject.org 14 Nov '13

14 Nov '13

commit f9d709eae3b0786106eaa20a82989646f972ec3d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 14 10:14:23 2013 -0500 Mark proposal 146 superseded by 206 --- proposals/000-index.txt | 4 ++-- proposals/146-long-term-stability.txt | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index eeb5292..1f84b47 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -66,7 +66,7 @@ Proposals by number: 143 Improvements of Distributed Storage for Tor Hidden Service Descriptors [OPEN] 144 Increase the diversity of circuits by detecting nodes belonging the same provider [DRAFT] 145 Separate "suitable as a guard" from "suitable as a new guard" [NEEDS-RESEARCH] -146 Add new flag to reflect long-term stability [NEEDS-RESEARCH] +146 Add new flag to reflect long-term stability [SUPERSEDED] 147 Eliminate the need for v2 directories in generating v3 directories [ACCEPTED] 148 Stream end reasons from the client side should be uniform [CLOSED] 149 Using data from NETINFO cells [SUPERSEDED] @@ -164,7 +164,6 @@ Proposals by status: 190 Bridge Client Authorization Based on a Shared Secret NEEDS-RESEARCH: 145 Separate "suitable as a guard" from "suitable as a new guard" - 146 Add new flag to reflect long-term stability OPEN: 143 Improvements of Distributed Storage for Tor Hidden Service Descriptors 156 Tracking blocked ports on the client side @@ -269,6 +268,7 @@ Proposals by status: 113 Simplifying directory authority administration 118 Advertising multiple ORPorts at once 124 Blocking resistant TLS certificate usage + 146 Add new flag to reflect long-term stability 149 Using data from NETINFO cells 153 Automatic software update protocol 154 Automatic Software Update Protocol diff --git a/proposals/146-long-term-stability.txt b/proposals/146-long-term-stability.txt index 0fe1464..650be33 100644 --- a/proposals/146-long-term-stability.txt +++ b/proposals/146-long-term-stability.txt @@ -2,7 +2,17 @@ Filename: 146-long-term-stability.txt Title: Add new flag to reflect long-term stability Author: Nick Mathewson Created: 19-Jun-2008 -Status: Needs-Research +Status: Superseded +Superseded-by: 206 + +Status: + + The applications of this design are achieved by proposal 206 instead. + Instead of having the authorities track long-term stability for nodes + that might be useful as directories in a fallback consensus, we + eliminated the idea of a fallback consensus, and just have a DirSource + configuration option. (Nov 2013) + Overview

1 0

[torspec/master] Looks like Roger marked 213 as "should be marked Dead" without Deadening it. Deadening.
by nickm＠torproject.org 14 Nov '13

14 Nov '13

commit 7f99bae864f908065f971ef12ecd965b349f4c4c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 14 09:57:41 2013 -0500 Looks like Roger marked 213 as "should be marked Dead" without Deadening it. Deadening. --- proposals/000-index.txt | 4 ++-- proposals/213-remove-stream-sendmes.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 32c6b76..eeb5292 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -133,7 +133,7 @@ Proposals by number: 210 Faster Headless Consensus Bootstrapping [OPEN] 211 Internal Mapaddress for Tor Configuration Testing [OPEN] 212 Increase Acceptable Consensus Age [OPEN] -213 Remove stream-level sendmes from the design [OPEN] +213 Remove stream-level sendmes from the design [DEAD] 214 Allow 4-byte circuit IDs in a new link protocol [CLOSED] 215 Let the minimum consensus method change with time [OPEN] 216 Improved circuit-creation key exchange [CLOSED] @@ -188,7 +188,6 @@ Proposals by status: 210 Faster Headless Consensus Bootstrapping [for 0.2.4.x+] 211 Internal Mapaddress for Tor Configuration Testing [for 0.2.4.x+] 212 Increase Acceptable Consensus Age [for 0.2.4.x+] - 213 Remove stream-level sendmes from the design 215 Let the minimum consensus method change with time 217 Tor Extended ORPort Authentication [for 0.2.5.x] ACCEPTED: @@ -283,5 +282,6 @@ Proposals by status: 120 Shutdown descriptors when Tor servers stop 128 Families of private bridges 142 Combine Introduction and Rendezvous Points + 213 Remove stream-level sendmes from the design REJECTED: 134 More robust consensus voting with diverse authority sets diff --git a/proposals/213-remove-stream-sendmes.txt b/proposals/213-remove-stream-sendmes.txt index f413876..f2b8b34 100644 --- a/proposals/213-remove-stream-sendmes.txt +++ b/proposals/213-remove-stream-sendmes.txt @@ -2,7 +2,7 @@ Filename: 213-remove-stream-sendmes.txt Title: Remove stream-level sendmes from the design Author: Roger Dingledine Created: 4-Nov-2012 -Status: Open +Status: Dead 1. Motivation

1 0

[tor-browser/tor-browser-24.1.0esr-1] fixup! Limit the number of fonts per document.
by mikeperry＠torproject.org 14 Nov '13

14 Nov '13

commit 0ae26ccccbec874689e5fbda6f30ba27a3c48b96 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Nov 14 00:07:37 2013 -0800 fixup! Limit the number of fonts per document. Kill signed comparison warnings. --- layout/base/nsPresContext.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index 3cf6628..7d84667 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -1417,7 +1417,7 @@ nsPresContext::FontUseCountReached(const nsFont &font) { } } - if (mFontsUsed.Length() >= mMaxFonts) { + if (mFontsUsed.Length() >= (unsigned)mMaxFonts) { return PR_TRUE; } @@ -1440,7 +1440,7 @@ nsPresContext::FontAttemptCountReached(const nsFont &font) { } } - if (mFontsTried.Length() >= mMaxFontAttempts) { + if (mFontsTried.Length() >= (unsigned)mMaxFontAttempts) { return PR_TRUE; } @@ -1463,7 +1463,7 @@ nsPresContext::AddFontUse(const nsFont &font) { } } - if (mFontsUsed.Length() >= mMaxFonts) { + if (mFontsUsed.Length() >= (unsigned)mMaxFonts) { return; } @@ -1487,7 +1487,7 @@ nsPresContext::AddFontAttempt(const nsFont &font) { } } - if (mFontsTried.Length() >= mMaxFontAttempts) { + if (mFontsTried.Length() >= (unsigned)mMaxFontAttempts) { return; }

1 0