October 2014 - 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 Oct '14

20 Oct '14

commit af0fdb85e9f3404b735f6fbdb3fd3aa67758eb17 Merge: fd8f21e fed78bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:31:20 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

1 0

[tor/release-0.2.4] Whoops, bump the version properly.
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit fed78bce8bc645866578a1739a10ee598bbaf4e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:29:16 2014 -0400 Whoops, bump the version properly. --- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 23a01b4..1e578cd 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.23" +!define VERSION "0.2.4.25-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 c86e2b0..d3f3eb1 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.23" +#define VERSION "0.2.4.25-dev"

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit 1f5b228ee89f237fa653313fb1824b60a717441f Merge: a8d6eb3 fed78bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:30:58 2014 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 Conflicts: contrib/tor-mingw.nsi.in src/win32/orconfig.h contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.4] Whoops, bump the version properly.
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit fed78bce8bc645866578a1739a10ee598bbaf4e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:29:16 2014 -0400 Whoops, bump the version properly. --- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 23a01b4..1e578cd 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.23" +!define VERSION "0.2.4.25-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 c86e2b0..d3f3eb1 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.23" +#define VERSION "0.2.4.25-dev"

1 0

[tor/maint-0.2.4] bump maint-0.2.4 to 0.2.4.25-dev
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit e2112dd0c021fb620e90dbef3456f96635982cfc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:24:21 2014 -0400 bump maint-0.2.4 to 0.2.4.25-dev --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3456013..9cf172a 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.23]) +AC_INIT([tor],[0.2.4.25-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE

1 0

[tor/release-0.2.4] Note that our #13426 fix is also a #13471 fix.
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit c1dd598df8972a6b7b8bdeff6a1549a7c171d7dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 19 15:38:44 2014 -0400 Note that our #13426 fix is also a #13471 fix. See also http://marc.info/?l=openssl-dev&m=141357408522028&w=2 --- changes/bug13471 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug13471 b/changes/bug13471 new file mode 100644 index 0000000..c116a4a --- /dev/null +++ b/changes/bug13471 @@ -0,0 +1,5 @@ + o Major bugfixes (openssl bug workaround): + - Avoid crashing when using OpenSSL version 0.9.8zc, 1.0.0o, or + 1.0.1j, built with the 'no-ssl3' configuration option. Fixes + bug 13471. This is a workaround for an OpenSSL bug. +

1 0

[tor/release-0.2.4] bump maint-0.2.4 to 0.2.4.25-dev
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit e2112dd0c021fb620e90dbef3456f96635982cfc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:24:21 2014 -0400 bump maint-0.2.4 to 0.2.4.25-dev --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3456013..9cf172a 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.23]) +AC_INIT([tor],[0.2.4.25-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit 403c6ae78e2dff753d407273ce78c024a0ffb40d Merge: 943fd4a c1dd598 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 19 15:39:48 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug13471 | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit a8d6eb30b88ec56e2bdef9d8a12ff308fa0223b5 Merge: 6b2ed1a e2112dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:26:19 2014 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 Conflicts: configure.ac changes/bug13471 | 5 +++++ configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 20 Oct '14

20 Oct '14

commit 4d993a33068a455c72b1d21da64f929fbd9f92a4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 20 14:16:37 2014 +0000 Update translations for tails-misc --- sl_SI.po | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sl_SI.po b/sl_SI.po index 40b8d07..0e69f77 100644 --- a/sl_SI.po +++ b/sl_SI.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 17:57+0200\n" -"PO-Revision-Date: 2014-10-20 13:42+0000\n" +"PO-Revision-Date: 2014-10-20 14:16+0000\n" "Last-Translator: Dušan <dusan.k(a)zoho.com>\n" "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/torproject/language/sl_SI/)\n" "MIME-Version: 1.0\n" @@ -113,56 +113,56 @@ msgstr "Prstni odtis:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:394 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Uporbnik ID:" +msgstr[1] "Uporabnika ID:" +msgstr[2] "Uporabniki ID:" +msgstr[3] "User IDs:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:424 msgid "None (Don't sign)" -msgstr "" +msgstr "Nobeden (Brez podpisa)" #: config/chroot_local-includes/usr/local/bin/gpgApplet:487 msgid "Select recipients:" -msgstr "" +msgstr "Izbira prejemnikov:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:495 msgid "Hide recipients" -msgstr "" +msgstr "Skrij prejemnike" #: config/chroot_local-includes/usr/local/bin/gpgApplet:498 msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." -msgstr "" +msgstr "Skrij ID uporabnika vsem prejemnikom šifriranega sporočila. Drugače lahko vsak, ki šifrirano sporočilo vidi, ve kdo je prejemnik." #: config/chroot_local-includes/usr/local/bin/gpgApplet:504 msgid "Sign message as:" -msgstr "" +msgstr "Podpiši sporočilo kot:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:508 msgid "Choose keys" -msgstr "" +msgstr "Izberite ključe" #: config/chroot_local-includes/usr/local/bin/gpgApplet:548 msgid "Do you trust these keys?" -msgstr "" +msgstr "Ali zaupate tem ključem?" #: config/chroot_local-includes/usr/local/bin/gpgApplet:551 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Sledeči izbran ključ ni vreden popolnega zaupanja:" +msgstr[1] "Sledeča izbrana ključa nista vredna popolnega zaupanja:" +msgstr[2] "Sledeči izbrani ključi niso vredni popolnega zaupanja:" +msgstr[3] "Sledeči izbrani ključi niso vredni popolnega zaupanja:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:569 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Ali dovolj zaupate temu ključu, da ga vseeno uporabite?" +msgstr[1] "Ali dovolj zaupate tema ključema, da ju vseeno uporabite?" +msgstr[2] "Ali dovolj zaupate tem ključem, da jih vseeno uporabite?" +msgstr[3] "Ali dovolj zaupate tem ključem, da jih vseeno uporabite?" #: config/chroot_local-includes/usr/local/bin/gpgApplet:582 msgid "No keys selected"

1 0