[tor-commits] [tor-browser/tor-browser-31.2.0esr-4.5-1] Changes needed to build Mac in 64bit

[mikeperry]

commit b8b6d86a5b6407b9e0f42bfe1de188e5be49b47d
Author: Tom Ritter t...@ritter.vg
Date:   Tue Sep 16 08:10:50 2014 -0500

Changes needed to build Mac in 64bit
---
 .mozconfig-mac   |4 ++--
 toolkit/library/dependentlibs.py |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.mozconfig-mac b/.mozconfig-mac
index 4abcc7c..2c06c34 100644
--- a/.mozconfig-mac
+++ b/.mozconfig-mac
@@ -2,7 +2,7 @@ export CROSS_COMPILE=1
 
 SYSROOTDIR=/usr/lib/apple/SDKs/MacOSX10.6.sdk
 ROOTDIR=$HOME/build/x-tools/x86_64-apple-darwin10/bin
-FLAGS=-arch i386 -isysroot $SYSROOTDIR
+FLAGS=-arch x86_64 -isysroot $SYSROOTDIR
 
 # Ideally we use the patch provided in
 # https://bugzilla.mozilla.org/show_bug.cgi?id=933071 to get rid of our path
@@ -26,7 +26,7 @@ mk_add_options MOZ_APP_DISPLAYNAME=Tor Browser
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 
-ac_add_options --target=i386-apple-darwin10
+ac_add_options --target=x86_64-apple-darwin10
 ac_add_options --enable-application=browser
 ac_add_options --enable-strip
 ac_add_options --enable-official-branding
diff --git a/toolkit/library/dependentlibs.py b/toolkit/library/dependentlibs.py
index 43433a1b..4331cfa 100644
--- a/toolkit/library/dependentlibs.py
+++ b/toolkit/library/dependentlibs.py
@@ -71,7 +71,7 @@ def dependentlibs_readelf(lib):
 
 def dependentlibs_otool(lib):
 '''Returns the list of dependencies declared in the given MACH-O dylib'''
-proc = subprocess.Popen(['otool', '-l', lib], stdout = subprocess.PIPE)
+proc = subprocess.Popen([../../../../x-tools/x86_64-apple-darwin10/bin/ 
+ TOOLCHAIN_PREFIX + 'otool', '-l', lib], stdout = subprocess.PIPE)
 deps= []
 cmd = None
 for line in proc.stdout:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-31.2.0esr-4.5-1] Merge remote-tracking branch 'tjr/tor-browser-31.2.0esr-4.x-1-build1-64bit' into tor-browser-31.2.0esr-4.5-1

[mikeperry]

commit be0ac860051f1c3d61ee00a5d9140595981d3f2c
Merge: e65a5a7 892f8b6
Author: Mike Perry mikeperry-...@torproject.org
Date:   Mon Nov 3 00:00:06 2014 -0800

Merge remote-tracking branch 'tjr/tor-browser-31.2.0esr-4.x-1-build1-64bit' 
into tor-browser-31.2.0esr-4.5-1

 .mozconfig-mac   |4 ++--
 toolkit/library/dependentlibs.py |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-31.2.0esr-4.5-1] It seems like we need to add one more path traversal for ESR31

[mikeperry]

commit 892f8b664e82abe2afb9b488f5e095c7d4006629
Author: Tom Ritter t...@ritter.vg
Date:   Mon Oct 27 11:31:20 2014 -0500

It seems like we need to add one more path traversal for ESR31
---
 toolkit/library/dependentlibs.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/library/dependentlibs.py b/toolkit/library/dependentlibs.py
index 4331cfa..4889a1e 100644
--- a/toolkit/library/dependentlibs.py
+++ b/toolkit/library/dependentlibs.py
@@ -71,7 +71,7 @@ def dependentlibs_readelf(lib):
 
 def dependentlibs_otool(lib):
 '''Returns the list of dependencies declared in the given MACH-O dylib'''
-proc = subprocess.Popen([../../../../x-tools/x86_64-apple-darwin10/bin/ 
+ TOOLCHAIN_PREFIX + 'otool', '-l', lib], stdout = subprocess.PIPE)
+proc = 
subprocess.Popen([../../../../../x-tools/x86_64-apple-darwin10/bin/ + 
TOOLCHAIN_PREFIX + 'otool', '-l', lib], stdout = subprocess.PIPE)
 deps= []
 cmd = None
 for line in proc.stdout:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Bump to build3 for 64bit osx fixes.

[mikeperry]

commit 31349ad13349e11a7f9343c4fec0fafe4cd2b44c
Author: Mike Perry mikeperry-...@torproject.org
Date:   Mon Nov 3 00:03:41 2014 -0800

Bump to build3 for 64bit osx fixes.
---
 gitian/versions.alpha |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 27ee9da..b84f92e 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -8,7 +8,7 @@ FIREFOX_VERSION=31.2.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build3
 TOR_TAG=tor-0.2.6.1-alpha
 TORLAUNCHER_TAG=0.2.7.0.1
 TORBUTTON_TAG=1.8.0.0

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

[translation]

commit 612679551240b071da73077e04193a913601d815
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 08:15:53 2014 +

Update translations for torbutton-torbuttondtd
---
 ja/torbutton.dtd |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ja/torbutton.dtd b/ja/torbutton.dtd
index 278f93a..4add4d2 100644
--- a/ja/torbutton.dtd
+++ b/ja/torbutton.dtd
@@ -44,7 +44,7 @@
 !ENTITY torbutton.context_menu.openTorWindow.key d
 !ENTITY torbutton.button.label Torbutton
 !ENTITY torbutton.button.tooltip Torbuttomを初期状態に戻す
-!ENTITY torbutton.prefs.privacy_security_settings Privacy and Security 
Settings
+!ENTITY torbutton.prefs.privacy_security_settings 
プライバシーとセキュリティーの設定
 !ENTITY torbutton.prefs.block_thread 
ブロック履歴がTor中に読みます (重要)
 !ENTITY torbutton.prefs.block_thwrite 
ブロック履歴がTor中に書き込まれます (推奨)
 !ENTITY torbutton.prefs.block_nthread 
非Tor中にブロック履歴を読みます (任意)
@@ -149,9 +149,9 @@
 !ENTITY torbutton.prefs.restrict_thirdparty 
サードパーティーのCookieやその他のトラッキングデータを制限
 !ENTITY torbutton.prefs.block_plugins 
ブラウザのプラグイン(フラッシュなど)を無効化
 !ENTITY torbutton.prefs.resist_fingerprinting 
あなたとほかのTorブラウザのユーザーを区別する詳細を変更
-!ENTITY torbutton.prefs.sec_caption Security Level
-!ENTITY torbutton.prefs.sec_low Low (default)
-!ENTITY torbutton.prefs.sec_med_low Medium-Low
-!ENTITY torbutton.prefs.sec_med_high Medium-High
-!ENTITY torbutton.prefs.sec_high High
-!ENTITY torbutton.prefs.sec_custom Custom Values
+!ENTITY torbutton.prefs.sec_caption セキュリティレベル
+!ENTITY torbutton.prefs.sec_low 低い(デフォルト)
+!ENTITY torbutton.prefs.sec_med_low 中の低
+!ENTITY torbutton.prefs.sec_med_high 中の上
+!ENTITY torbutton.prefs.sec_high 高い
+!ENTITY torbutton.prefs.sec_custom カスタム値

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

[translation]

commit 5501c461a1ae4d3e2f6955a698117ed0e4a53a5a
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 08:15:30 2014 +

Update translations for tor-launcher-properties
---
 id/torlauncher.properties |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/id/torlauncher.properties b/id/torlauncher.properties
index 682cd0d..d23a153 100644
--- a/id/torlauncher.properties
+++ b/id/torlauncher.properties
@@ -5,20 +5,20 @@ torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in 
Tor itself, another program on your system, or faulty hardware. Until you 
restart Tor, the Tor Browser will not able to reach any websites. If the 
problem persists, please send a copy of your Tor Log to the support team.
 torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
-torlauncher.tor_controlconn_failed=Tidak dapat tersambung pada port Tor
+torlauncher.tor_controlconn_failed=Tidak dapat tersambung pada port kontrol 
Tor.
 torlauncher.tor_failed_to_start=Tor gagal untuk memulai.
 torlauncher.tor_control_failed=Failed to take control of Tor.
-torlauncher.tor_bootstrap_failed=Tor tidak dapat tersambung pada jaringan.
+torlauncher.tor_bootstrap_failed=Tor gagal menghasilkan koneksi jaringan Tor.
 torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Tidak dapat memulai Tor\n\n%S
 torlauncher.tor_missing=Tor executable hilang
 torlauncher.torrc_missing=File torrc hilang
-torlauncher.datadir_missing=Tor data direktori tidak ada.
-torlauncher.password_hash_missing=Failed to get hashed password.
+torlauncher.datadir_missing=Direktori data Tor tidak ada.
+torlauncher.password_hash_missing=Gagal mendapatkan kata sandi hashed.
 
-torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
-torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S
+torlauncher.failed_to_get_settings=Gagal mendapatkan settings Tor.\n\n%S
+torlauncher.failed_to_save_settings=Tidak dapat menyimpan pengaturan Tor.\n\n%S
 torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
 
 torlauncher.error_proxy_addr_missing=Anda harus menentukan baik alamat IP atau 
nama host dan nomor port untuk mengkonfigurasi Tor untuk menggunakan proxy 
untuk mengakses Internet.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

[translation]

commit b3039bbb24e48e78da8dbc47ebf69ec6653dae56
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 08:15:39 2014 +

Update translations for tails-misc
---
 ja.po |   23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/ja.po b/ja.po
index d08a0c9..5d55998 100644
--- a/ja.po
+++ b/ja.po
@@ -6,13 +6,14 @@
 # sunpower92 fumihit...@gmail.com, 2014
 # タカハシ gomid...@live.jp, 2013-2014
 # Masaki Saito rezoo...@gmail.com, 2013
+# mksyslab i...@mksyslab.com, 2014
 msgid 
 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-19 12:21+\n
-Last-Translator: sunpower92 fumihit...@gmail.com\n
+PO-Revision-Date: 2014-11-03 08:12+\n
+Last-Translator: mksyslab i...@mksyslab.com\n
 Language-Team: Japanese 
(http://www.transifex.com/projects/p/torproject/language/ja/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -443,30 +444,30 @@ msgstr 
I2Pの開始時になにかエラーが起きたようです。/var/log/
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:42
 msgid I2P's router console is ready
-msgstr 
+msgstr I2Pルータコンソールは準備完了
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:43
 msgid You can now access I2P's router console on http://127.0.0.1:7657.;
-msgstr 
+msgstr 
I2Pのルータ・コンソールにhttp://127.0.0.1:7657からアクセスできます;
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:48
 msgid I2P is not ready
-msgstr 
+msgstr I2Pは準備できていません
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49
 msgid 
 Eepsite tunnel not built within six minutes. Check the router console at 
 http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information.
  Reconnect to the network to try again.
-msgstr 
+msgstr Eepsite tunnelは6分以内
に構築されませんでした。ルータ・コンソールのhttp://127.0.0.1:7657/logsか/var/log/i2pのログを確認してくã
 ã•ã„。再トライするにはネットワークに再接続してくだ
さい
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:59
 msgid I2P is ready
-msgstr 
+msgstr I2Pは準備完了
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60
 msgid You can now access services on I2P.
-msgstr 
+msgstr I2Pサービスにアクセスできます
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
 msgid Report an error
@@ -483,11 +484,11 @@ msgstr Tails の使い方を知る
 
 #: 
../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1
 msgid Anonymous overlay network browser
-msgstr 
+msgstr 
アノニマス・オーバーレイ・ネットワーク・ブラウザ
 
 #: 
../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2
 msgid I2P Browser
-msgstr 
+msgstr I2Pブラウザ
 
 #: 
../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2
 msgid Learn more about Tails
@@ -515,7 +516,7 @@ msgstr Tor Browser
 
 #: 
../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
 msgid Anonymous Web Browser
-msgstr 
+msgstr アノニマス・ウェブ・ブラウザ
 
 #: 
../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
 msgid Browse the World Wide Web without anonymity

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

[translation]

commit d412d5b86b45149c546c483bf24b705f07ce6368
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 08:45:32 2014 +

Update translations for tor-launcher-properties_completed
---
 id/torlauncher.properties |   61 +
 1 file changed, 61 insertions(+)

diff --git a/id/torlauncher.properties b/id/torlauncher.properties
new file mode 100644
index 000..cc23057
--- /dev/null
+++ b/id/torlauncher.properties
@@ -0,0 +1,61 @@
+### Copyright (c) 2014, The Tor Project, Inc.
+### See LICENSE for licensing information.
+
+torlauncher.error_title=Tor Launcher
+
+torlauncher.tor_exited=Tor keluar mendadak. Ini dapat terjadi karena bug dalam 
Tor, atau program lain di sistem Anda, atau kerusakan perangkat keras. Sampai 
anda memuat ulang Tor, Browser Tor tidak dapat mencapai situs web apapun. Jika 
masalah ini terus bertahan, mohon mengirimkan salinan dari log Tor Anda kepada 
tim pendukung.
+torlauncher.tor_exited2=Memuat ulang Tor tidak akan menutup tab browser Anda.
+torlauncher.tor_controlconn_failed=Tidak dapat tersambung pada port kontrol 
Tor.
+torlauncher.tor_failed_to_start=Tor gagal untuk memulai.
+torlauncher.tor_control_failed=Gagal untuk mendapatkan kontrol Tor.
+torlauncher.tor_bootstrap_failed=Tor gagal menghasilkan koneksi jaringan Tor.
+torlauncher.tor_bootstrap_failed_details=%1$S gagal (%2$S).
+
+torlauncher.unable_to_start_tor=Tidak dapat memulai Tor\n\n%S
+torlauncher.tor_missing=Tor executable hilang
+torlauncher.torrc_missing=File torrc hilang
+torlauncher.datadir_missing=Direktori data Tor tidak ada.
+torlauncher.password_hash_missing=Gagal mendapatkan kata sandi hashed.
+
+torlauncher.failed_to_get_settings=Gagal mendapatkan pengaturan Tor.\n\n%S
+torlauncher.failed_to_save_settings=Tidak dapat menyimpan pengaturan Tor.\n\n%S
+torlauncher.ensure_tor_is_running=Mohon pastikan Tor sedang berjalan.
+
+torlauncher.error_proxy_addr_missing=Anda harus menentukan baik alamat IP atau 
nama host dan nomor port untuk mengkonfigurasi Tor supaya menggunakan sebuah 
proxy untuk mengakses Internet.
+torlauncher.error_proxy_type_missing=Anda harus memilih jenis proxy.
+torlauncher.error_bridges_missing=Anda harus menspesifikan satu bridge atau 
lebih.
+torlauncher.error_default_bridges_type_missing=Anda harus memilih satu tipe 
transportasi untuk bridges yang tersedia.
+torlauncher.error_bridge_bad_default_type=Tidak ada bridges tersedia yang 
memiliki tipe transportasi %S tersedia. Mohon sesuaikan pengaturan Anda.
+
+torlauncher.recommended_bridge=(recommended)
+
+torlauncher.connect=Hubungi
+torlauncher.restart_tor=Muat ulang Tor
+torlauncher.quit=Berhenti
+torlauncher.quit_win=Keluar
+torlauncher.done=Selesai.
+
+torlauncher.forAssistance=Untuk bantuan, hubungi $S
+
+torlauncher.copiedNLogMessages=Penyalinan selesai. %S log pesan Tor telah siap 
untuk ditempelkan ke dalam editor text atau pesan email.
+
+torlauncher.bootstrapStatus.conn_dir=Menghubungkan ke direktori relay
+torlauncher.bootstrapStatus.handshake_dir=Membuat koneksi direktori 
terenkripsi 
+torlauncher.bootstrapStatus.requesting_status=Mengambil status jaringan
+torlauncher.bootstrapStatus.loading_status=Memuat status jaringan
+torlauncher.bootstrapStatus.loading_keys=Memuat sertifikat otoritas
+torlauncher.bootstrapStatus.requesting_descriptors=Meminta informasi relay
+torlauncher.bootstrapStatus.loading_descriptors=Memuat informasi relay
+torlauncher.bootstrapStatus.conn_or=Menghubungkan ke jaringan Tor
+torlauncher.bootstrapStatus.handshake_or=Membuat sirkuit Tor
+torlauncher.bootstrapStatus.done=Telah terhubung ke jaringan Tor
+
+torlauncher.bootstrapWarning.done=selesai
+torlauncher.bootstrapWarning.connectrefused=koneksi ditolak
+torlauncher.bootstrapWarning.misc=aneka
+torlauncher.bootstrapWarning.resourcelimit=sumber daya tidak mencukupi
+torlauncher.bootstrapWarning.identity=identitas tidak cocok
+torlauncher.bootstrapWarning.timeout=waktu koneksi habis
+torlauncher.bootstrapWarning.noroute=tidak ada rute ke host
+torlauncher.bootstrapWarning.ioerror=error baca/tulis
+torlauncher.bootstrapWarning.pt_missing=kehilangan pluggable transport

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

[translation]

commit f7ad7a37e8cd06631d544ae9f12c91a140c5d303
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 08:45:29 2014 +

Update translations for tor-launcher-properties
---
 id/torlauncher.properties |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/id/torlauncher.properties b/id/torlauncher.properties
index d23a153..cc23057 100644
--- a/id/torlauncher.properties
+++ b/id/torlauncher.properties
@@ -3,13 +3,13 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in 
Tor itself, another program on your system, or faulty hardware. Until you 
restart Tor, the Tor Browser will not able to reach any websites. If the 
problem persists, please send a copy of your Tor Log to the support team.
-torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
+torlauncher.tor_exited=Tor keluar mendadak. Ini dapat terjadi karena bug dalam 
Tor, atau program lain di sistem Anda, atau kerusakan perangkat keras. Sampai 
anda memuat ulang Tor, Browser Tor tidak dapat mencapai situs web apapun. Jika 
masalah ini terus bertahan, mohon mengirimkan salinan dari log Tor Anda kepada 
tim pendukung.
+torlauncher.tor_exited2=Memuat ulang Tor tidak akan menutup tab browser Anda.
 torlauncher.tor_controlconn_failed=Tidak dapat tersambung pada port kontrol 
Tor.
 torlauncher.tor_failed_to_start=Tor gagal untuk memulai.
-torlauncher.tor_control_failed=Failed to take control of Tor.
+torlauncher.tor_control_failed=Gagal untuk mendapatkan kontrol Tor.
 torlauncher.tor_bootstrap_failed=Tor gagal menghasilkan koneksi jaringan Tor.
-torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
+torlauncher.tor_bootstrap_failed_details=%1$S gagal (%2$S).
 
 torlauncher.unable_to_start_tor=Tidak dapat memulai Tor\n\n%S
 torlauncher.tor_missing=Tor executable hilang
@@ -17,15 +17,15 @@ torlauncher.torrc_missing=File torrc hilang
 torlauncher.datadir_missing=Direktori data Tor tidak ada.
 torlauncher.password_hash_missing=Gagal mendapatkan kata sandi hashed.
 
-torlauncher.failed_to_get_settings=Gagal mendapatkan settings Tor.\n\n%S
+torlauncher.failed_to_get_settings=Gagal mendapatkan pengaturan Tor.\n\n%S
 torlauncher.failed_to_save_settings=Tidak dapat menyimpan pengaturan Tor.\n\n%S
-torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
+torlauncher.ensure_tor_is_running=Mohon pastikan Tor sedang berjalan.
 
-torlauncher.error_proxy_addr_missing=Anda harus menentukan baik alamat IP atau 
nama host dan nomor port untuk mengkonfigurasi Tor untuk menggunakan proxy 
untuk mengakses Internet.
+torlauncher.error_proxy_addr_missing=Anda harus menentukan baik alamat IP atau 
nama host dan nomor port untuk mengkonfigurasi Tor supaya menggunakan sebuah 
proxy untuk mengakses Internet.
 torlauncher.error_proxy_type_missing=Anda harus memilih jenis proxy.
 torlauncher.error_bridges_missing=Anda harus menspesifikan satu bridge atau 
lebih.
-torlauncher.error_default_bridges_type_missing=You must select a transport 
type for the provided bridges.
-torlauncher.error_bridge_bad_default_type=No provided bridges that have the 
transport type %S are available. Please adjust your settings.
+torlauncher.error_default_bridges_type_missing=Anda harus memilih satu tipe 
transportasi untuk bridges yang tersedia.
+torlauncher.error_bridge_bad_default_type=Tidak ada bridges tersedia yang 
memiliki tipe transportasi %S tersedia. Mohon sesuaikan pengaturan Anda.
 
 torlauncher.recommended_bridge=(recommended)
 
@@ -35,18 +35,18 @@ torlauncher.quit=Berhenti
 torlauncher.quit_win=Keluar
 torlauncher.done=Selesai.
 
-torlauncher.forAssistance=For assistance, contact %S
+torlauncher.forAssistance=Untuk bantuan, hubungi $S
 
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to 
be pasted into a text editor or an email message.
+torlauncher.copiedNLogMessages=Penyalinan selesai. %S log pesan Tor telah siap 
untuk ditempelkan ke dalam editor text atau pesan email.
 
-torlauncher.bootstrapStatus.conn_dir=Menghubungkan diri ke direktori relay
+torlauncher.bootstrapStatus.conn_dir=Menghubungkan ke direktori relay
 torlauncher.bootstrapStatus.handshake_dir=Membuat koneksi direktori 
terenkripsi 
 torlauncher.bootstrapStatus.requesting_status=Mengambil status jaringan
 torlauncher.bootstrapStatus.loading_status=Memuat status jaringan
 torlauncher.bootstrapStatus.loading_keys=Memuat sertifikat otoritas
 torlauncher.bootstrapStatus.requesting_descriptors=Meminta informasi relay
 torlauncher.bootstrapStatus.loading_descriptors=Memuat informasi relay
-torlauncher.bootstrapStatus.conn_or=Menghubungkan diri ke jaringan Tor
+torlauncher.bootstrapStatus.conn_or=Menghubungkan ke jaringan Tor
 torlauncher.bootstrapStatus.handshake_or=Membuat sirkuit Tor
 torlauncher.bootstrapStatus.done=Telah terhubung ke jaringan Tor
 
@@ -58,4 +58,4 @@ torlauncher.bootstrapWarning.identity=identitas tidak 

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

[translation]

commit 3b2b1fde94136187a0421e0fe8d5fe8ed81fc152
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 08:45:44 2014 +

Update translations for tails-misc_completed
---
 ja.po |  175 -
 1 file changed, 98 insertions(+), 77 deletions(-)

diff --git a/ja.po b/ja.po
index 5089c98..4e5c4e8 100644
--- a/ja.po
+++ b/ja.po
@@ -3,15 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# plazmism gomid...@live.jp, 2013-2014
+# sunpower92 fumihit...@gmail.com, 2014
+# タカハシ gomid...@live.jp, 2013-2014
 # Masaki Saito rezoo...@gmail.com, 2013
+# mksyslab, 2014
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2014-05-29 00:14+0200\n
-PO-Revision-Date: 2014-06-03 15:12+\n
-Last-Translator: plazmism gomid...@live.jp\n
+POT-Creation-Date: 2014-10-15 17:57+0200\n
+PO-Revision-Date: 2014-11-03 08:30+\n
+Last-Translator: mksyslab\n
 Language-Team: Japanese 
(http://www.transifex.com/projects/p/torproject/language/ja/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -19,11 +21,11 @@ msgstr 
 Language: ja\n
 Plural-Forms: nplurals=1; plural=0;\n
 
-#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
+#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42
 msgid Tor is ready
 msgstr Tor は準備完了
 
-#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44
+#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
 msgid You can now access the Internet.
 msgstr インターネットにアクセスできます。
 
@@ -195,22 +197,6 @@ msgstr GnuPGの出力:
 msgid Other messages provided by GnuPG:
 msgstr GnuPGからのそのほかのメッセージ:
 
-#: config/chroot_local-includes/usr/local/bin/iceweasel:12
-msgid Tor is not ready
-msgstr Tor は準備出来ていません
-
-#: config/chroot_local-includes/usr/local/bin/iceweasel:13
-msgid Tor is not ready. Start Tor Browser anyway?
-msgstr Tor は準備出来ていません。とにかく Tor Browser 
を起動しますか？
-
-#: config/chroot_local-includes/usr/local/bin/iceweasel:14
-msgid Start Tor Browser
-msgstr Tor Browser を起動
-
-#: config/chroot_local-includes/usr/local/bin/iceweasel:15
-msgid Cancel
-msgstr キャンセル
-
 #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39
 msgid Shutdown Immediately
 msgstr すぐにシャットダウンする
@@ -315,38 +301,13 @@ msgid 
 You might prefer to restart Tails and disable MAC spoofing. See the a 
href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'documentation/a.
 msgstr MAC スプーフィングが、ネットワークカード ${nic_name} 
(${nic}) 
のために失敗しました。エラーリカバリも失敗したので、å…
¨ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æ©Ÿèƒ½ãŒç„¡åŠ¹ã«ãªã‚Šã¾ã™ã€‚ Tails 
を再起動して、 MAC 
スプーフィングを無効化したいと思うかもしれません。a 
href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'ドキュメント/aをご覧くã
 ã•ã„。
 
-#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62
-msgid Starting I2P...
-msgstr I2Pを起動中...
-
-#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:63
-msgid The I2P router console will be opened on start.
-msgstr I2Pルーターコンソールは、開始時に開かれます。
-
-#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:82
-#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:124
-msgid I2P failed to start
-msgstr I2Pは起動できませんでした
-
-#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:83
-msgid 
-Make sure that you have a working Internet connection, then try to start I2P
- again.
-msgstr 
有効なインターネット接続があることを確認してから、I2Pをもう一度起動してみてくã
 ã•ã„。
-
-#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:125
-msgid 
-Something went wrong when I2P was starting. Look in the logs in the 
-following directory for more information:
-msgstr 
I2Pの起動時に問題が起こりました。詳細については、以下のディレクトリå†
…のログで確認してください:
-
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:62
 msgid error:
 msgstr エラー:
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:63
 msgid Error
 msgstr エラー
 
@@ -380,77 +341,133 

[tor-commits] [translation/tails-misc] Update translations for tails-misc

[translation]

commit 110e95e5f1099574bb56443c90fbfcbc8abb2c26
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 08:45:41 2014 +

Update translations for tails-misc
---
 ja.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ja.po b/ja.po
index 5d55998..4e5c4e8 100644
--- a/ja.po
+++ b/ja.po
@@ -6,14 +6,14 @@
 # sunpower92 fumihit...@gmail.com, 2014
 # タカハシ gomid...@live.jp, 2013-2014
 # Masaki Saito rezoo...@gmail.com, 2013
-# mksyslab i...@mksyslab.com, 2014
+# mksyslab, 2014
 msgid 
 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-11-03 08:12+\n
-Last-Translator: mksyslab i...@mksyslab.com\n
+PO-Revision-Date: 2014-11-03 08:30+\n
+Last-Translator: mksyslab\n
 Language-Team: Japanese 
(http://www.transifex.com/projects/p/torproject/language/ja/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -430,7 +430,7 @@ msgid 
 recommend that you learn how to a 
 
href='file:///usr/share/doc/tails/website/doc/encryption_and_privacy/truecrypt.en.html#cryptsetup'open
  TrueCrypt volumes with cryptsetup/a as soon as possible.
-msgstr 
+msgstr TrueCryptはメンテナンスされておらず、制作者
によって安全でないといわれています。そのためTails 1.2.1 
(November 25)で削除される予定です。できるだけ早く、a 
href='file:///usr/share/doc/tails/website/doc/encryption_and_privacy/truecrypt.en.html#cryptsetup'open
 TrueCrypt volumes with 
cryptsetup/aについて学ばれることを推奨します。
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:30
 msgid I2P failed to start

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-tasks/master] Add graphing code for bandwidth by version (13634).

[karsten]

commit f0b12e1198afb38a8f72f68d855fbee6d0e73367
Author: Karsten Loesing karsten.loes...@gmx.net
Date:   Mon Nov 3 10:18:31 2014 +0100

Add graphing code for bandwidth by version (13634).
---
 task-13634/.gitignore|8 +++
 task-13634/aggregate.R   |   10 +
 task-13634/plot.R|9 
 task-13634/src/Main.java |   55 ++
 4 files changed, 82 insertions(+)

diff --git a/task-13634/.gitignore b/task-13634/.gitignore
new file mode 100644
index 000..b23a00a
--- /dev/null
+++ b/task-13634/.gitignore
@@ -0,0 +1,8 @@
+.classpath
+.project
+/bin
+/in
+Rplots.pdf
+*.csv
+*.png
+
diff --git a/task-13634/aggregate.R b/task-13634/aggregate.R
new file mode 100644
index 000..0c2cf6b
--- /dev/null
+++ b/task-13634/aggregate.R
@@ -0,0 +1,10 @@
+c - read.csv(cw-by-ver.csv, header = FALSE)
+c - aggregate(list(cw = c$V3),
+   by = list(datetime = c$V1, version = c$V2),
+   FUN = sum)
+c - aggregate(list(cw = c$cw),
+   by = list(date = as.character(as.Date(c$datetime)),
+ version = c$version),
+   FUN = mean)
+write.csv(c, cw-by-ver-date.csv, row.names = FALSE, quote = FALSE)
+
diff --git a/task-13634/plot.R b/task-13634/plot.R
new file mode 100644
index 000..efb84f0
--- /dev/null
+++ b/task-13634/plot.R
@@ -0,0 +1,9 @@
+require(ggplot2)
+c - read.csv(cw-by-ver-date.csv)
+ggplot(c, aes(x = as.Date(date), y = cw, colour = version)) +
+geom_line() +
+scale_x_date() +
+scale_y_continuous() +
+ggtitle(Total consensus weight of running relays by version\n)
+ggsave(cw-by-ver.png, width = 8, height = 5, dpi = 100)
+
diff --git a/task-13634/src/Main.java b/task-13634/src/Main.java
new file mode 100644
index 000..7c0ddb0
--- /dev/null
+++ b/task-13634/src/Main.java
@@ -0,0 +1,55 @@
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Iterator;
+import java.util.TimeZone;
+
+import org.torproject.descriptor.Descriptor;
+import org.torproject.descriptor.DescriptorFile;
+import org.torproject.descriptor.DescriptorReader;
+import org.torproject.descriptor.DescriptorSourceFactory;
+import org.torproject.descriptor.NetworkStatusEntry;
+import org.torproject.descriptor.RelayNetworkStatusConsensus;
+
+
+public class Main {
+  public static void main(String[] args) throws Exception {
+BufferedWriter bw = new BufferedWriter(new FileWriter(
+cw-by-ver.csv));
+DescriptorReader descriptorReader =
+DescriptorSourceFactory.createDescriptorReader();
+descriptorReader.addDirectory(new File(in));
+IteratorDescriptorFile descriptorFiles =
+descriptorReader.readDescriptors();
+while (descriptorFiles.hasNext()) {
+  DescriptorFile descriptorFile = descriptorFiles.next();
+  for (Descriptor descriptor : descriptorFile.getDescriptors()) {
+if (!(descriptor instanceof RelayNetworkStatusConsensus)) {
+  continue;
+}
+RelayNetworkStatusConsensus consensus =
+(RelayNetworkStatusConsensus) descriptor;
+DateFormat dateTimeFormat = new SimpleDateFormat(
+-MM-dd HH:mm:ss);
+dateTimeFormat.setTimeZone(TimeZone.getTimeZone(UTC));
+String validAfter = dateTimeFormat.format(
+consensus.getValidAfterMillis());
+for (NetworkStatusEntry entry :
+consensus.getStatusEntries().values()) {
+  String version = entry.getVersion();
+  if (version != null  version.startsWith(Tor ) 
+  version.length() = 9) {
+version = version.substring(4, 9); /* 0.2.5 of Tor 0.2.5.11 */
+  } else {
+version = other;
+  }
+  bw.write(validAfter + , + version + ,
+  + entry.getBandwidth() + \n);
+}
+  }
+}
+bw.close();
+  }
+}

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

[translation]

commit 5ce28e98ca12bcaad4b818235c3ef5e073f8a3e0
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 10:45:46 2014 +

Update translations for torbutton-torbuttondtd
---
 es/torbutton.dtd |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/es/torbutton.dtd b/es/torbutton.dtd
index 6bdba71..c51f7f9 100644
--- a/es/torbutton.dtd
+++ b/es/torbutton.dtd
@@ -44,7 +44,7 @@
 !ENTITY torbutton.context_menu.openTorWindow.key v
 !ENTITY torbutton.button.label Torbutton
 !ENTITY torbutton.button.tooltip Haga clic para inicializar Torbutton
-!ENTITY torbutton.prefs.privacy_security_settings Privacy and Security 
Settings
+!ENTITY torbutton.prefs.privacy_security_settings Preferencias de Privacidad 
y Seguridad
 !ENTITY torbutton.prefs.block_thread Bloquear lecturas del historial al usar 
Tor (crucial)
 !ENTITY torbutton.prefs.block_thwrite Bloquear escrituras al historial al 
usar Tor (recomendado)
 !ENTITY torbutton.prefs.block_nthread Bloquear lecturas del historial al no 
usar Tor (opcional)
@@ -149,9 +149,9 @@
 !ENTITY torbutton.prefs.restrict_thirdparty Restringir cookies de terceros y 
otros datos de seguimiento
 !ENTITY torbutton.prefs.block_plugins Desactivar complementos del navegador 
(como Flash)
 !ENTITY torbutton.prefs.resist_fingerprinting Cambiar los detalles que le 
distinguen de otros usuarios de Navegador Tor
-!ENTITY torbutton.prefs.sec_caption Security Level
-!ENTITY torbutton.prefs.sec_low Low (default)
-!ENTITY torbutton.prefs.sec_med_low Medium-Low
-!ENTITY torbutton.prefs.sec_med_high Medium-High
-!ENTITY torbutton.prefs.sec_high High
-!ENTITY torbutton.prefs.sec_custom Custom Values
+!ENTITY torbutton.prefs.sec_caption Nivel de Seguridad
+!ENTITY torbutton.prefs.sec_low Bajo (por defecto)
+!ENTITY torbutton.prefs.sec_med_low Medio-Bajo
+!ENTITY torbutton.prefs.sec_med_high Medio-Alto
+!ENTITY torbutton.prefs.sec_high Alto
+!ENTITY torbutton.prefs.sec_custom Valores Personalizados

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [obfsproxy/master] Handle missing ScrambleSuit passwords in managed mode.

[asn]

commit 49dd8aae6064839d08f677b1ff641b56951dd9ca
Author: Yawning Angel yawn...@torproject.org
Date:   Sat Nov 1 03:45:55 2014 +

Handle missing ScrambleSuit passwords in managed mode.

If the password argument is missing from the bridge line entirely,
`handle_socks_args()` will never get called as the username/password
auth will not be negotiated.  Correctly detect that this has happened
at client handshake time, log a warning and drop the connection.

Fixes bug #13587.
---
 ChangeLog |5 +
 obfsproxy/transports/scramblesuit/scramblesuit.py |5 +
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b9791da..7d66351 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes in version 0.2.13 - UNRELEASED:
+ - Correctly handle the ScrambleSuit password being missing entirely
+   when running in managed mode. Patch by Yawning Angel. Fixes #13587.
+
+
 Changes in version 0.2.12 - 2014-07-22:
  - Add txsocksx and parsley as dependencies in py2exe. Fixes bug #12381.
 
diff --git a/obfsproxy/transports/scramblesuit/scramblesuit.py 
b/obfsproxy/transports/scramblesuit/scramblesuit.py
index 1479f12..3f93b1d 100644
--- a/obfsproxy/transports/scramblesuit/scramblesuit.py
+++ b/obfsproxy/transports/scramblesuit/scramblesuit.py
@@ -238,6 +238,11 @@ class ScrambleSuitTransport( base.BaseTransport ):
 
 # Conduct an authenticated UniformDH handshake if there's no ticket.
 else:
+if self.uniformDHSecret is None:
+log.warning(A UniformDH password is not set, most likely  \
+a missing 'password' argument.)
+self.circuit.close()
+return
 log.debug(No session ticket to redeem.  Running UniformDH.)
 self.circuit.downstream.write(self.uniformdh.createHandshake())
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

[translation]

commit a586fd51dde90b9aaa0ba37365bf38792ecaa32d
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 15:45:17 2014 +

Update translations for liveusb-creator
---
 id/id.po |   61 +++--
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/id/id.po b/id/id.po
index 8cadf25..e9bcce9 100644
--- a/id/id.po
+++ b/id/id.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Budiman Jojo budimanj...@gmail.com, 2014
 # Dichi Al Faridi di...@alfaridi.info, 2010
 # Fathan Imanudin night.atara...@gmail.com, 2014
 # Slamet slamet.ba...@gmail.com, 2014
@@ -10,9 +11,9 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2014-07-01 22:11+0200\n
-PO-Revision-Date: 2014-07-02 08:55+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+POT-Creation-Date: 2014-10-15 16:05+0200\n
+PO-Revision-Date: 2014-11-03 15:45+\n
+Last-Translator: Budiman Jojo budimanj...@gmail.com\n
 Language-Team: Indonesian 
(http://www.transifex.com/projects/p/torproject/language/id/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -40,7 +41,7 @@ msgstr %(size)s %(label)s
 msgid %(vendor)s %(model)s (%(details)s) - %(device)s
 msgstr %(vendor)s %(model)s (%(details)s) - %(device)s
 
-#: ../liveusb/creator.py:1047
+#: ../liveusb/creator.py:1059
 #, python-format
 msgid %s already bootable
 msgstr %s sudah bootable
@@ -97,12 +98,12 @@ msgid 
 persist after a reboot.
 msgstr 
 
-#: ../liveusb/creator.py:1146 ../liveusb/creator.py:1409
+#: ../liveusb/creator.py:1158 ../liveusb/creator.py:1421
 #, python-format
 msgid Calculating the SHA1 of %s
 msgstr Menghitung SHA1 dari %s
 
-#: ../liveusb/creator.py:1357
+#: ../liveusb/creator.py:1369
 msgid Cannot find
 msgstr Tidak menemukan
 
@@ -153,7 +154,7 @@ msgstr Download gagal:
 msgid Downloading %s...
 msgstr Mengunduh %s...
 
-#: ../liveusb/creator.py:1142
+#: ../liveusb/creator.py:1154
 msgid Drive is a loopback, skipping MBR reset
 msgstr 
 
@@ -162,7 +163,7 @@ msgstr 
 msgid Entering unmount_device for '%(device)s'
 msgstr 
 
-#: ../liveusb/creator.py:1222
+#: ../liveusb/creator.py:1234
 msgid Error probing device
 msgstr 
 
@@ -182,7 +183,7 @@ msgstr Kesalahan: SHA1 dari Live CD Anda tidak valid. Anda 
dapat menjalankan pr
 msgid Extracting live image to the target device...
 msgstr 
 
-#: ../liveusb/creator.py:1090
+#: ../liveusb/creator.py:1102
 #, python-format
 msgid Formatting %(device)s as FAT32
 msgstr Memformat %(device)s sebagai FAT32
@@ -218,7 +219,7 @@ msgstr Pemasangan sudah tuntas! (%s)
 msgid Installation was completed. Press OK to close this program.
 msgstr Pemasangan sudah tuntas! Tekan OK untuk menutup program ini.
 
-#: ../liveusb/creator.py:947 ../liveusb/creator.py:1263
+#: ../liveusb/creator.py:959 ../liveusb/creator.py:1275
 msgid Installing bootloader...
 msgstr Memasang bootloader...
 
@@ -226,13 +227,13 @@ msgstr Memasang bootloader...
 msgid LiveUSB creation failed!
 msgstr Penciptaan LiveUSB gagal!
 
-#: ../liveusb/creator.py:1358
+#: ../liveusb/creator.py:1370
 msgid 
 Make sure to extract the entire liveusb-creator zip file before running this
  program.
 msgstr Pastikan untuk mengekstrak seluruh berkas zip liveusb-creator sebelum 
menjalankan program ini.
 
-#: ../liveusb/creator.py:1234
+#: ../liveusb/creator.py:1246
 msgid 
 Make sure your USB key is plugged in and formatted with the FAT filesystem
 msgstr Pastikan kunci USB Anda terhubung dan diformat dengan sistem berkas 
FAT
@@ -282,22 +283,22 @@ msgstr 
 
 #: ../liveusb/gui.py:451
 msgid Refreshing releases...
-msgstr 
+msgstr Menyegarkan rilis...
 
 #: ../liveusb/gui.py:456
 msgid Releases updated!
-msgstr 
+msgstr Rilis telah diperbarui!
 
-#: ../liveusb/creator.py:954 ../liveusb/creator.py:1281
+#: ../liveusb/creator.py:966 ../liveusb/creator.py:1293
 #, python-format
 msgid Removing %(file)s
-msgstr 
+msgstr Menghapus %(file)s
 
 #: ../liveusb/creator.py:483
 msgid Removing existing Live OS
-msgstr 
+msgstr Menghapus OS Live yang telah ada
 
-#: ../liveusb/creator.py:1136
+#: ../liveusb/creator.py:1148
 #, python-format
 msgid Resetting Master Boot Record of %s
 msgstr 
@@ -322,7 +323,7 @@ msgid 
 Source type does not support verification of ISO MD5 checksum, skipping
 msgstr 
 
-#: ../liveusb/creator.py:1170
+#: ../liveusb/creator.py:1182
 msgid Synchronizing data on disk...
 msgstr 
 
@@ -374,11 +375,11 @@ msgstr 
 msgid This is the status console, where all messages get written to.
 msgstr 
 
-#: ../liveusb/creator.py:910
+#: ../liveusb/creator.py:922
 msgid Trying to continue anyway.
 msgstr 
 
-#: ../liveusb/creator.py:942
+#: ../liveusb/creator.py:954
 #, python-format
 msgid Unable to change volume label: %(message)s
 msgstr 
@@ -397,15 +398,15 @@ msgstr 
 msgid Unable to find any USB drive
 msgstr Gagal menemukan perangkat USB
 
-#: ../liveusb/creator.py:1224
+#: 

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

[translation]

commit 8afd5eb1610acc7e3eadd9758bcb0df2efedabff
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 16:15:17 2014 +

Update translations for liveusb-creator
---
 id/id.po |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/id/id.po b/id/id.po
index e9bcce9..624c2aa 100644
--- a/id/id.po
+++ b/id/id.po
@@ -12,7 +12,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2014-10-15 16:05+0200\n
-PO-Revision-Date: 2014-11-03 15:45+\n
+PO-Revision-Date: 2014-11-03 15:51+\n
 Last-Translator: Budiman Jojo budimanj...@gmail.com\n
 Language-Team: Indonesian 
(http://www.transifex.com/projects/p/torproject/language/id/)\n
 MIME-Version: 1.0\n
@@ -279,7 +279,7 @@ msgstr Penyimpanan Menetap (0 MB)
 
 #: ../liveusb/gui.py:667 ../liveusb/gui.py:696
 msgid Please confirm your device selection
-msgstr 
+msgstr Mohon mengkonfirmasi perangkat pilihan anda
 
 #: ../liveusb/gui.py:451
 msgid Refreshing releases...
@@ -301,7 +301,7 @@ msgstr Menghapus OS Live yang telah ada
 #: ../liveusb/creator.py:1148
 #, python-format
 msgid Resetting Master Boot Record of %s
-msgstr 
+msgstr Mengatur ulang Master Boot Record dari %s
 
 #: ../liveusb/gui.py:758
 msgid Select Live ISO

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

[translation]

commit df7d1d92cc585006ce48f6c7044aa3b4b9790afb
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 19:45:52 2014 +

Update translations for abouttor-homepage_completed
---
 tr/aboutTor.dtd |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd
index 5e6e3e5..bdcd023 100644
--- a/tr/aboutTor.dtd
+++ b/tr/aboutTor.dtd
@@ -8,14 +8,14 @@
 
 !ENTITY aboutTor.outOfDateTorOn.label AMA, bu tarayıcı güncel değil.
 !ENTITY aboutTor.outOfDateTorOff.label AYRICA, bu tarayıcı güncel 
değil.
-!ENTITY aboutTor.outOfDate2.label Soğana tıklayın ve Tor Tarayıcı 
Paketi Güncellemesini İndir seçin.
+!ENTITY aboutTor.outOfDate2.label Soğana tıklayın ve Tor Tarayıcı 
Paketi Güncellemesini İndir'i seçin.
 
-!ENTITY aboutTor.check.label Tor Ağ ayarlarını test edin
+!ENTITY aboutTor.check.label Tor Ağ Ayarlarını Test Edin
 
 !ENTITY aboutTor.success.label Tebrikler!
 !ENTITY aboutTor.success2.label Bu tarayıcı Tor kullanımı için 
yapılandırılmıştır.
 !ENTITY aboutTor.success3.label Artık İnternet'i anonim olarak kullanmakta 
özgürsünüz!
-!ENTITY aboutTor.failure.label Üzgünüz, bir şeyler yanlış gitti!
+!ENTITY aboutTor.failure.label Bir Şeyler Yanlış Gitti!
 !ENTITY aboutTor.failure2.label Bu tarayıcıda Tor çalışmıyor.
 !ENTITY aboutTor.failure3prefix.label Yardım için #37;S ile bağlantıya 
geçin.
 !ENTITY aboutTor.failure3Link h...@rt.torproject.org
@@ -28,19 +28,19 @@
 
 !ENTITY aboutTor.torInfo1.label Ek bilgi:
 !ENTITY aboutTor.torInfo2.label Ülke ve IP Adresi:
-!ENTITY aboutTor.torInfo3.label Çıkış düğümü:
+!ENTITY aboutTor.torInfo3.label Çıkış Düğümü:
 !ENTITY aboutTor.torInfo4.label Bu sunucu ziyaretçiler ile ilgili herhangi 
bir bilgi toplamaz.
-!ENTITY aboutTor.whatnextQuestion.label Sırada ne var?
+!ENTITY aboutTor.whatnextQuestion.label Sıradaki Ne?
 !ENTITY aboutTor.whatnextAnswer.label Tor, anonim kalmanız için tüm 
ihtiyacınız olan şey değildir! Kimliğinizin güvende kalması için bazı 
İnternet alışkanlıklarınızı değiştirmeniz gerekebilir.
 !ENTITY aboutTor.whatnext.label Anonim kalmak için püf noktalar »
 !ENTITY aboutTor.whatnext.link 
https://www.torproject.org/download/download.html.en#warning;
-!ENTITY aboutTor.helpInfo1.label Yardım edebilirsiniz!
+!ENTITY aboutTor.helpInfo1.label Yardım Edebilirsiniz!
 !ENTITY aboutTor.helpInfo2.label Tor ağını daha hızlı ve daha güçlü 
yapmamız konusunda yardım edebilmeniz için bir çok yol var:
 !ENTITY aboutTor.helpInfo3.label Bir Tor Ayna Düğümü Çalıştır »
 !ENTITY aboutTor.helpInfo3.link 
https://www.torproject.org/docs/tor-doc-relay.html.en;
-!ENTITY aboutTor.helpInfo4.label Servislerinizi gönüllü yapın »
+!ENTITY aboutTor.helpInfo4.label Servislerinizi Gönüllü Yapın »
 !ENTITY aboutTor.helpInfo4.link 
https://www.torproject.org/getinvolved/volunteer.html.en;
-!ENTITY aboutTor.helpInfo5.label Bağış yapın »
+!ENTITY aboutTor.helpInfo5.label Bağış Yapın »
 !ENTITY aboutTor.helpInfo5.link 
https://www.torproject.org/donate/donate.html.en;
 
 !ENTITY aboutTor.footer.label Tor Projesi çevrimiçi gizlilik ve mahremiyet 
araştırma, geliştirme ve eğitime adanmış bir ABD 501(c)(3) kar amacı 
gütmeyen bir kuruluştur.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

[translation]

commit 7acc575b461cee42e1c3223798d65e392ea349bc
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 19:45:17 2014 +

Update translations for https_everywhere
---
 tr/https-everywhere.dtd |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tr/https-everywhere.dtd b/tr/https-everywhere.dtd
index 30cf5db..23036e2 100644
--- a/tr/https-everywhere.dtd
+++ b/tr/https-everywhere.dtd
@@ -1,8 +1,8 @@
 !ENTITY https-everywhere.about.title HTTPS Her Yerde Hakkında
 !ENTITY https-everywhere.about.ext_name HTTPS Her Yerde
-!ENTITY https-everywhere.about.ext_description İnternet'i şifreleyin! Bir 
çok sitede otomatik olarak HTTPS kullan.
+!ENTITY https-everywhere.about.ext_description İnternet'i şifreleyin! Bir 
çok sitede otomatik olarak HTTPS güvenliğini kullanın.
 !ENTITY https-everywhere.about.version Sürüm
-!ENTITY https-everywhere.about.created_by Oluşturan
+!ENTITY https-everywhere.about.created_by Oluşturan:
 !ENTITY https-everywhere.about.librarians Kural Seti Kütüphaneleri
 !ENTITY https-everywhere.about.thanks Teşekkürler
 !ENTITY https-everywhere.about.contribute  Eğer HTTPS Everywhere'i 
sevdiyseniz, siz de destek olabilirsiniz
@@ -27,13 +27,13 @@
 !ENTITY https-everywhere.prefs.enabled Etkin
 !ENTITY https-everywhere.prefs.ruleset_howto Kendi kural setlerinizi nasıl 
yazabileceğinizi öğrenebilirsiniz (diğer web sitelerine destek eklemek 
için)
 !ENTITY https-everywhere.prefs.here_link öğrenebilirsin.
-!ENTITY https-everywhere.prefs.toggle Değiştir
+!ENTITY https-everywhere.prefs.toggle Geçiş
 !ENTITY https-everywhere.prefs.reset_default Varsayılana Dön
 !ENTITY https-everywhere.prefs.view_xml_source XML Kaynağını 
Görüntüle
 
 !ENTITY https-everywhere.source.downloading Ä°ndiriliyor
 !ENTITY https-everywhere.source.filename Dosya Adı
-!ENTITY https-everywhere.source.unable_to_download Kaynak indirmeye uygun 
değil
+!ENTITY https-everywhere.source.unable_to_download Kaynak indirilemedi.
 
 !ENTITY https-everywhere.popup.title HTTPS Her Yerde 4.0geliştirme.11 
bildirimi
 !ENTITY https-everywhere.popup.paragraph1 Olamaz. HTTPS Her Yerde'nin 
kararlı sürümünü kullanıyordunuz ancak yanlışlıkla sizi en son 
dağıtımımızın geliştirme sürümüne yükseltmiş olabiliriz.
@@ -43,5 +43,5 @@
 !ENTITY https-everywhere.popup.revert Kararlı son sürümü indir
 
 !ENTITY https-everywhere.ruleset-tests.status_title HTTPS Her Yerde Kural 
Kümesi Sınamaları
-!ENTITY https-everywhere.ruleset-tests.status_cancel_button Vazgeç
+!ENTITY https-everywhere.ruleset-tests.status_cancel_button Ä°ptal
 !ENTITY https-everywhere.ruleset-tests.status_start_button Başlat

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

[translation]

commit acf4d1c80d9329eeb74e56b661d75c73829fcaf1
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 19:46:07 2014 +

Update translations for torbutton-torbuttondtd
---
 tr/torbutton.dtd |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tr/torbutton.dtd b/tr/torbutton.dtd
index 0160e6a..d911237 100644
--- a/tr/torbutton.dtd
+++ b/tr/torbutton.dtd
@@ -44,7 +44,7 @@
 !ENTITY torbutton.context_menu.openTorWindow.key d
 !ENTITY torbutton.button.label Torbuton
 !ENTITY torbutton.button.tooltip Başlat
-!ENTITY torbutton.prefs.privacy_security_settings Privacy and Security 
Settings
+!ENTITY torbutton.prefs.privacy_security_settings Gizlilik ve Güvenlik 
Ayarları
 !ENTITY torbutton.prefs.block_thread Tor çalışırken geçmişi okumayı 
durdur(kritik)
 !ENTITY torbutton.prefs.block_thwrite Tor çalışırken geçmişi 
oluşturmayı durdur(önerilen)
 !ENTITY torbutton.prefs.block_nthread Tor çalışmıyorken geçmişi 
okumayı durdur (opsiyonel)
@@ -149,9 +149,9 @@
 !ENTITY torbutton.prefs.restrict_thirdparty 3. parti çerezleri ve diğer iz 
sürücü bilgileri engelle
 !ENTITY torbutton.prefs.block_plugins Tarayıcı eklentilerini engelle 
(Flash benzeri)
 !ENTITY torbutton.prefs.resist_fingerprinting Diğer Tor kullanıcılardan 
sizi ayıran detayları değiştir
-!ENTITY torbutton.prefs.sec_caption Security Level
-!ENTITY torbutton.prefs.sec_low Low (default)
-!ENTITY torbutton.prefs.sec_med_low Medium-Low
-!ENTITY torbutton.prefs.sec_med_high Medium-High
-!ENTITY torbutton.prefs.sec_high High
-!ENTITY torbutton.prefs.sec_custom Custom Values
+!ENTITY torbutton.prefs.sec_caption Güvenlik Seviyesi
+!ENTITY torbutton.prefs.sec_low Düşük (varsayılan)
+!ENTITY torbutton.prefs.sec_med_low Orta-Düşük
+!ENTITY torbutton.prefs.sec_med_high Orta-Yüksek
+!ENTITY torbutton.prefs.sec_high Yüksek
+!ENTITY torbutton.prefs.sec_custom Özel Değerler

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-browserproperties] Update translations for torbutton-browserproperties

[translation]

commit b42964f424e9b871a1c2be709c8b2218fe703c55
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 19:45:59 2014 +

Update translations for torbutton-browserproperties
---
 tr/browser.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr/browser.properties b/tr/browser.properties
index 295a03a..d788077 100644
--- a/tr/browser.properties
+++ b/tr/browser.properties
@@ -2,7 +2,7 @@
 browser.startup.homepage=about:tor
 
 # Spell checker dictionary
-spellchecker.dictionary=en_US
+spellchecker.dictionary=tr_TR
 
 # Default search engine
 browser.search.defaultenginename=Startpage

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

[translation]

commit c73ca8b40bf55a473d8b06a48f869736701cbde1
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 19:45:48 2014 +

Update translations for abouttor-homepage
---
 tr/aboutTor.dtd |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd
index 5e6e3e5..bdcd023 100644
--- a/tr/aboutTor.dtd
+++ b/tr/aboutTor.dtd
@@ -8,14 +8,14 @@
 
 !ENTITY aboutTor.outOfDateTorOn.label AMA, bu tarayıcı güncel değil.
 !ENTITY aboutTor.outOfDateTorOff.label AYRICA, bu tarayıcı güncel 
değil.
-!ENTITY aboutTor.outOfDate2.label Soğana tıklayın ve Tor Tarayıcı 
Paketi Güncellemesini İndir seçin.
+!ENTITY aboutTor.outOfDate2.label Soğana tıklayın ve Tor Tarayıcı 
Paketi Güncellemesini İndir'i seçin.
 
-!ENTITY aboutTor.check.label Tor Ağ ayarlarını test edin
+!ENTITY aboutTor.check.label Tor Ağ Ayarlarını Test Edin
 
 !ENTITY aboutTor.success.label Tebrikler!
 !ENTITY aboutTor.success2.label Bu tarayıcı Tor kullanımı için 
yapılandırılmıştır.
 !ENTITY aboutTor.success3.label Artık İnternet'i anonim olarak kullanmakta 
özgürsünüz!
-!ENTITY aboutTor.failure.label Üzgünüz, bir şeyler yanlış gitti!
+!ENTITY aboutTor.failure.label Bir Şeyler Yanlış Gitti!
 !ENTITY aboutTor.failure2.label Bu tarayıcıda Tor çalışmıyor.
 !ENTITY aboutTor.failure3prefix.label Yardım için #37;S ile bağlantıya 
geçin.
 !ENTITY aboutTor.failure3Link h...@rt.torproject.org
@@ -28,19 +28,19 @@
 
 !ENTITY aboutTor.torInfo1.label Ek bilgi:
 !ENTITY aboutTor.torInfo2.label Ülke ve IP Adresi:
-!ENTITY aboutTor.torInfo3.label Çıkış düğümü:
+!ENTITY aboutTor.torInfo3.label Çıkış Düğümü:
 !ENTITY aboutTor.torInfo4.label Bu sunucu ziyaretçiler ile ilgili herhangi 
bir bilgi toplamaz.
-!ENTITY aboutTor.whatnextQuestion.label Sırada ne var?
+!ENTITY aboutTor.whatnextQuestion.label Sıradaki Ne?
 !ENTITY aboutTor.whatnextAnswer.label Tor, anonim kalmanız için tüm 
ihtiyacınız olan şey değildir! Kimliğinizin güvende kalması için bazı 
İnternet alışkanlıklarınızı değiştirmeniz gerekebilir.
 !ENTITY aboutTor.whatnext.label Anonim kalmak için püf noktalar »
 !ENTITY aboutTor.whatnext.link 
https://www.torproject.org/download/download.html.en#warning;
-!ENTITY aboutTor.helpInfo1.label Yardım edebilirsiniz!
+!ENTITY aboutTor.helpInfo1.label Yardım Edebilirsiniz!
 !ENTITY aboutTor.helpInfo2.label Tor ağını daha hızlı ve daha güçlü 
yapmamız konusunda yardım edebilmeniz için bir çok yol var:
 !ENTITY aboutTor.helpInfo3.label Bir Tor Ayna Düğümü Çalıştır »
 !ENTITY aboutTor.helpInfo3.link 
https://www.torproject.org/docs/tor-doc-relay.html.en;
-!ENTITY aboutTor.helpInfo4.label Servislerinizi gönüllü yapın »
+!ENTITY aboutTor.helpInfo4.label Servislerinizi Gönüllü Yapın »
 !ENTITY aboutTor.helpInfo4.link 
https://www.torproject.org/getinvolved/volunteer.html.en;
-!ENTITY aboutTor.helpInfo5.label Bağış yapın »
+!ENTITY aboutTor.helpInfo5.label Bağış Yapın »
 !ENTITY aboutTor.helpInfo5.link 
https://www.torproject.org/donate/donate.html.en;
 
 !ENTITY aboutTor.footer.label Tor Projesi çevrimiçi gizlilik ve mahremiyet 
araştırma, geliştirme ve eğitime adanmış bir ABD 501(c)(3) kar amacı 
gütmeyen bir kuruluştur.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

[translation]

commit a8482af0c41f99926aaaff1021ab765e28ac65d4
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 19:45:24 2014 +

Update translations for https_everywhere_completed
---
 tr/https-everywhere.dtd |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tr/https-everywhere.dtd b/tr/https-everywhere.dtd
index 30cf5db..23036e2 100644
--- a/tr/https-everywhere.dtd
+++ b/tr/https-everywhere.dtd
@@ -1,8 +1,8 @@
 !ENTITY https-everywhere.about.title HTTPS Her Yerde Hakkında
 !ENTITY https-everywhere.about.ext_name HTTPS Her Yerde
-!ENTITY https-everywhere.about.ext_description İnternet'i şifreleyin! Bir 
çok sitede otomatik olarak HTTPS kullan.
+!ENTITY https-everywhere.about.ext_description İnternet'i şifreleyin! Bir 
çok sitede otomatik olarak HTTPS güvenliğini kullanın.
 !ENTITY https-everywhere.about.version Sürüm
-!ENTITY https-everywhere.about.created_by Oluşturan
+!ENTITY https-everywhere.about.created_by Oluşturan:
 !ENTITY https-everywhere.about.librarians Kural Seti Kütüphaneleri
 !ENTITY https-everywhere.about.thanks Teşekkürler
 !ENTITY https-everywhere.about.contribute  Eğer HTTPS Everywhere'i 
sevdiyseniz, siz de destek olabilirsiniz
@@ -27,13 +27,13 @@
 !ENTITY https-everywhere.prefs.enabled Etkin
 !ENTITY https-everywhere.prefs.ruleset_howto Kendi kural setlerinizi nasıl 
yazabileceğinizi öğrenebilirsiniz (diğer web sitelerine destek eklemek 
için)
 !ENTITY https-everywhere.prefs.here_link öğrenebilirsin.
-!ENTITY https-everywhere.prefs.toggle Değiştir
+!ENTITY https-everywhere.prefs.toggle Geçiş
 !ENTITY https-everywhere.prefs.reset_default Varsayılana Dön
 !ENTITY https-everywhere.prefs.view_xml_source XML Kaynağını 
Görüntüle
 
 !ENTITY https-everywhere.source.downloading Ä°ndiriliyor
 !ENTITY https-everywhere.source.filename Dosya Adı
-!ENTITY https-everywhere.source.unable_to_download Kaynak indirmeye uygun 
değil
+!ENTITY https-everywhere.source.unable_to_download Kaynak indirilemedi.
 
 !ENTITY https-everywhere.popup.title HTTPS Her Yerde 4.0geliştirme.11 
bildirimi
 !ENTITY https-everywhere.popup.paragraph1 Olamaz. HTTPS Her Yerde'nin 
kararlı sürümünü kullanıyordunuz ancak yanlışlıkla sizi en son 
dağıtımımızın geliştirme sürümüne yükseltmiş olabiliriz.
@@ -43,5 +43,5 @@
 !ENTITY https-everywhere.popup.revert Kararlı son sürümü indir
 
 !ENTITY https-everywhere.ruleset-tests.status_title HTTPS Her Yerde Kural 
Kümesi Sınamaları
-!ENTITY https-everywhere.ruleset-tests.status_cancel_button Vazgeç
+!ENTITY https-everywhere.ruleset-tests.status_cancel_button Ä°ptal
 !ENTITY https-everywhere.ruleset-tests.status_start_button Başlat

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-browserproperties_completed] Update translations for torbutton-browserproperties_completed

[translation]

commit 099265c4b80c94408d6fe97740c693af0ebecdeb
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 19:46:03 2014 +

Update translations for torbutton-browserproperties_completed
---
 tr/browser.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr/browser.properties b/tr/browser.properties
index 295a03a..d788077 100644
--- a/tr/browser.properties
+++ b/tr/browser.properties
@@ -2,7 +2,7 @@
 browser.startup.homepage=about:tor
 
 # Spell checker dictionary
-spellchecker.dictionary=en_US
+spellchecker.dictionary=tr_TR
 
 # Default search engine
 browser.search.defaultenginename=Startpage

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

[translation]

commit 15fdd668cfbba095288808432c9c306430074bf6
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 21:15:42 2014 +

Update translations for tails-misc_completed
---
 tr.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr.po b/tr.po
index 6f8b2d4..eb9a800 100644
--- a/tr.po
+++ b/tr.po
@@ -17,7 +17,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-29 02:00+\n
+PO-Revision-Date: 2014-11-03 21:01+\n
 Last-Translator: Volkan Gezer volkange...@gmail.com\n
 Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

[translation]

commit 3472d8f0feea922bf468c39e83e16120bc9d7135
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 21:15:38 2014 +

Update translations for tails-misc
---
 tr.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr.po b/tr.po
index 6f8b2d4..eb9a800 100644
--- a/tr.po
+++ b/tr.po
@@ -17,7 +17,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-29 02:00+\n
+PO-Revision-Date: 2014-11-03 21:01+\n
 Last-Translator: Volkan Gezer volkange...@gmail.com\n
 Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

[translation]

commit afbc8ac7bcc755a27b58c29fc4466a5b0c6d0485
Author: Translation commit bot translat...@torproject.org
Date:   Mon Nov 3 22:45:48 2014 +

Update translations for torbutton-torbuttondtd
---
 ru/torbutton.dtd |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ru/torbutton.dtd b/ru/torbutton.dtd
index 38efcd1..3bc9df2 100644
--- a/ru/torbutton.dtd
+++ b/ru/torbutton.dtd
@@ -44,7 +44,7 @@
 !ENTITY torbutton.context_menu.openTorWindow.key d
 !ENTITY torbutton.button.label Torbutton
 !ENTITY torbutton.button.tooltip Инициализировать Torbutton
-!ENTITY torbutton.prefs.privacy_security_settings Privacy and Security 
Settings
+!ENTITY torbutton.prefs.privacy_security_settings Настройки 
Конфиденциальности и Безопасности
 !ENTITY torbutton.prefs.block_thread Блокировать чтение 
из журнала в режиме Tor (важно)
 !ENTITY torbutton.prefs.block_thwrite Блокировать запись в 
журнал в режиме Tor (желательно)
 !ENTITY torbutton.prefs.block_nthread Блокировать чтение 
из журнала в режиме не-Tor (необяз.)
@@ -149,9 +149,9 @@
 !ENTITY torbutton.prefs.restrict_thirdparty Блокировать 
сторонние куки и другие данные слежения
 !ENTITY torbutton.prefs.block_plugins Отключить 
расширения браузера (такие как Flash)
 !ENTITY torbutton.prefs.resist_fingerprinting Изменить 
сведения, отличающие вас от других 
пользователей Tor Browser
-!ENTITY torbutton.prefs.sec_caption Security Level
-!ENTITY torbutton.prefs.sec_low Low (default)
-!ENTITY torbutton.prefs.sec_med_low Medium-Low
-!ENTITY torbutton.prefs.sec_med_high Medium-High
-!ENTITY torbutton.prefs.sec_high High
-!ENTITY torbutton.prefs.sec_custom Custom Values
+!ENTITY torbutton.prefs.sec_caption Уровень Безопасности
+!ENTITY torbutton.prefs.sec_low Низкий (по умолчанию)
+!ENTITY torbutton.prefs.sec_med_low Средне-Низкий
+!ENTITY torbutton.prefs.sec_med_high Средне-Высокий
+!ENTITY torbutton.prefs.sec_high Высокий
+!ENTITY torbutton.prefs.sec_custom Собственные Значения

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] Bump changelog and version for 1.8.0.1

[mikeperry]

commit c688cf25b3b8ec5752a6afccdffe2ededb6a1c66
Author: Mike Perry mikeperry-...@torproject.org
Date:   Mon Nov 3 19:32:49 2014 -0800

Bump changelog and version for 1.8.0.1
---
 src/CHANGELOG   |3 +++
 src/install.rdf |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index 0ad0e44..98d3251 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,6 @@
+1.8.0.1
+ * Bug 13651: Fix hangs associated with circuit status UI from #8641.
+
 1.8.0.0
  * Bug 9387: Provide a Security Slider for vulnerability surface reduction
  * Bug 13019: Synchronize locale spoofing pref with our Firefox patch
diff --git a/src/install.rdf b/src/install.rdf
index 4148b3c..ae50323 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
 em:nameTorbutton/em:name
 em:creatorMike Perry/em:creator
 em:idtorbut...@torproject.org/em:id
-em:version1.8.0.0/em:version
+em:version1.8.0.1/em:version
 
em:homepageURLhttps://www.torproject.org/projects/torbrowser.html.en/em:homepageURL
 
em:optionsURLchrome://torbutton/content/preferences.xul/em:optionsURL
 em:iconURLchrome://torbutton/skin/tor.png/em:iconURL

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Update changelog for meek fix.

[mikeperry]

commit 40721d5393f5247fd1075886244fa77558e35ef2
Author: Mike Perry mikeperry-...@torproject.org
Date:   Mon Nov 3 19:20:37 2014 -0800

Update changelog for meek fix.
---
 Bundle-Data/Docs/ChangeLog.txt |1 +
 1 file changed, 1 insertion(+)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 4098fe7..376a38b 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -12,6 +12,7 @@ Tor Browser 4.5-alpha-1 -- Nov 3 2014
  * Bug 13019: Synchronize locale spoofing pref with our Firefox patch
  * Bug 3455: Use SOCKS user+pass to isolate all requests from the same url 
domain
  * Bug 8641: Create browser UI to indicate current tab's Tor circuit IPs
+   * Bug 13586: Make meek use TLS session tickets (to look like stock Firefox).
* Include obfs4proxy pluggable transport
  * Windows
* Bug 13443: Re-enable DirectShow; fix crash with mingw patch.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] fixup! Bug #8641: TorButton popup menu that displays current Tor circuit

[mikeperry]

commit aeb53cde3f5765e8c5e7062afe9dba5b3fc68b50
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Mon Nov 3 13:38:48 2014 -0800

fixup! Bug #8641: TorButton popup menu that displays current Tor circuit
---
 src/chrome/content/tor-circuit-display.js |1 +
 src/modules/tor-control-port.js   |   52 +++--
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/chrome/content/tor-circuit-display.js 
b/src/chrome/content/tor-circuit-display.js
index 5f4d8bf..3a1fed8 100644
--- a/src/chrome/content/tor-circuit-display.js
+++ b/src/chrome/content/tor-circuit-display.js
@@ -41,6 +41,7 @@ let regionBundle = Services.strings.createBundle(
 // Convert a country code to a localized country name.
 // Example: `'de'` - `'Deutschland'` in German locale.
 let localizedCountryNameFromCode = function (countryCode) {
+  if (typeof(countryCode) === undefined) return ;
   try {
 return regionBundle.GetStringFromName(countryCode.toLowerCase());
   } catch (e) {
diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js
index 2f993d7..855b34b 100644
--- a/src/modules/tor-control-port.js
+++ b/src/modules/tor-control-port.js
@@ -14,12 +14,23 @@
 
 /* jshint esnext: true */
 /* jshint -W097 */
-/* global Components, console */
+/* global Components, console, Services */
 use strict;
 
 // ### Mozilla Abbreviations
 let {classes: Cc, interfaces: Ci, results: Cr, Constructor: CC, utils: Cu } = 
Components;
 
+// ### Import Mozilla Services
+Cu.import(resource://gre/modules/Services.jsm);
+
+// ## torbutton logger
+let logger = Cc[@torproject.org/torbutton-logger;1]
+   .getService(Components.interfaces.nsISupports).wrappedJSObject,
+log = x = logger.eclog(3, x);
+
+// ### announce this file
+log(Loading tor-control-port.js\n);
+
 // ## io
 // I/O utilities namespace
 let io = io || {};
@@ -30,12 +41,12 @@ let io = io || {};
 io.asyncSocketStreams = function (host, port) {
   let socketTransportService = 
Cc[@mozilla.org/network/socket-transport-service;1]
.getService(Components.interfaces.nsISocketTransportService),
-  BLOCKING = Ci.nsITransport.OPEN_BLOCKING,
   UNBUFFERED = Ci.nsITransport.OPEN_UNBUFFERED,
-   // Create an instance of a socket transport.
+  // Create an instance of a socket transport.
   socketTransport = socketTransportService.createTransport(null, 0, host, 
port, null),
-  // Open unbuffered synchronous outputStream.
-  outputStream = socketTransport.openOutputStream(BLOCKING | UNBUFFERED, 
1, 1),
+  // Open unbuffered asynchronous outputStream.
+  outputStream = socketTransport.openOutputStream(UNBUFFERED, 1, 1)
+  .QueryInterface(Ci.nsIAsyncOutputStream),
   // Open unbuffered asynchronous inputStream.
   inputStream = socketTransport.openInputStream(UNBUFFERED, 1, 1)
   .QueryInterface(Ci.nsIAsyncInputStream);
@@ -81,21 +92,28 @@ io.pumpInputStream = function (inputStream, onInputData, 
onError) {
 // socket.write(text) and socket.close(). onError will be passed the error 
object
 // whenever a write fails.
 io.asyncSocket = function (host, port, onInputData, onError) {
-  let [inputStream, outputStream] = io.asyncSocketStreams(host, port);
+  let [inputStream, outputStream] = io.asyncSocketStreams(host, port),
+  pendingWrites = [];
   // Run an input stream pump to send incoming data to the onInputData 
callback.
   io.pumpInputStream(inputStream, onInputData, onError);
+  // Return the socket object as described.
   return {
// Write a message to the socket.
write : function(aString) {
- try {
-   outputStream.write(aString, aString.length);
-   // console.log(aString);
- } catch (err) {
-   // This write() method is not necessarily called by a callback,
-   // but we pass any thrown errors to onError to ensure the socket
-   // error handling uses a consistent single path.
-   onError(err);
- }
+ pendingWrites.push(aString);
+ outputStream.asyncWait(
+   // Implement an nsIOutputStreamCallback:
+   { onOutputStreamReady : function () {
+ let totalString = pendingWrites.join();
+   try {
+ outputStream.write(totalString, totalString.length);
+ log(wrote:  + aString + \n);
+   } catch (err) {
+ onError(err);
+   }
+   pendingWrites = [];
+   } },
+   0, 0, Services.tm.currentThread);
},
// Close the socket.
close : function () {
@@ -146,7 +164,7 @@ io.onLineFromOnMessage = function (onMessage) {
   pendingLines = [];
   // Pass multiline message to onMessage.
   onMessage(message);
-  // console.log(message);
+  

[tor-commits] [tor-browser-bundle/master] Use the new security.ssl.disable_session_identifiers pref.

[mikeperry]

commit a609ff09f7ba996ac51da49bdcef3ee796d58959
Author: David Fifield da...@bamsoftware.com
Date:   Sun Oct 26 19:06:17 2014 +

Use the new security.ssl.disable_session_identifiers pref.

This is to reenable the TLS session tickets that are disabled by Tor
Browser, so the TLS client hello matches that of stock Firefox.

https://trac.torproject.org/projects/tor/ticket/13442#comment:1
https://trac.torproject.org/projects/tor/ticket/11183#comment:9

The previously used pref security.enable_tls_session_tickets has been
removed and replaced by security.ssl.disable_session_identifiers.

https://bugzilla.mozilla.org/show_bug.cgi?id=917049
https://bugzilla.mozilla.org/show_bug.cgi?id=967977
https://trac.torproject.org/projects/tor/ticket/10822

https://gitweb.torproject.org/tor-browser.git/commitdiff/5524ae43780e4738310852cc2a0b7c5d25aa69ed
---
 Bundle-Data/PTConfigs/meek-http-helper-user.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js 
b/Bundle-Data/PTConfigs/meek-http-helper-user.js
index cddc237..eb94d1d 100644
--- a/Bundle-Data/PTConfigs/meek-http-helper-user.js
+++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js
@@ -6,8 +6,8 @@ user_pref(browser.dom.window.dump.enabled, true);
 
 // Enable TLS session tickets (disabled by default in Tor Browser). Otherwise
 // there is a missing TLS extension.
-// https://trac.torproject.org/projects/tor/ticket/11183#comment:9
-user_pref(security.enable_tls_session_tickets, true);
+// https://trac.torproject.org/projects/tor/ticket/13442#comment:1
+user_pref(security.ssl.disable_session_identifiers, false);
 
 // Disable safe mode. In case of a crash, we don't want to prompt for a
 // safe-mode browser that has extensions disabled and no proxy.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Update version and changelog for Torbutton 1.8.0.1

[mikeperry]

commit d4351a02e34c07b21c0efa029496e515a5482df8
Author: Mike Perry mikeperry-...@torproject.org
Date:   Mon Nov 3 20:18:22 2014 -0800

Update version and changelog for Torbutton 1.8.0.1
---
 Bundle-Data/Docs/ChangeLog.txt |3 ++-
 gitian/versions.alpha  |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 376a38b..cac86a7 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -7,11 +7,12 @@ Tor Browser 4.5-alpha-1 -- Nov 3 2014
* Bug 13460: Fix MSVC compilation issue
* Update Tor to 0.2.6.0-alpha
* Update NoScript to 2.6.9.3
-   * Update Torbutton to 1.8.0.0
+   * Update Torbutton to 1.8.0.1
  * Bug 9387: Provide a Security Slider for vulnerability surface 
reduction
  * Bug 13019: Synchronize locale spoofing pref with our Firefox patch
  * Bug 3455: Use SOCKS user+pass to isolate all requests from the same url 
domain
  * Bug 8641: Create browser UI to indicate current tab's Tor circuit IPs
+ * Bug 13651: Prevent circuit-status related UI hang.
* Bug 13586: Make meek use TLS session tickets (to look like stock Firefox).
* Include obfs4proxy pluggable transport
  * Windows
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index b84f92e..284c4ef 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -11,7 +11,7 @@ TORBROWSER_UPDATE_CHANNEL=alpha
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build3
 TOR_TAG=tor-0.2.6.1-alpha
 TORLAUNCHER_TAG=0.2.7.0.1
-TORBUTTON_TAG=1.8.0.0
+TORBUTTON_TAG=1.8.0.1
 HTTPSE_TAG=3.5.3  # XXX: HTTPSE_VER is used instead, pending #11630
 NSIS_TAG=v0.2
 ZLIB_TAG=v1.2.8

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Add comments and rename intro_nodes list in rend_services_introduce()

[nickm]

commit 71355e1db937b0b940bb9510c927e3e500cabc22
Author: David Goulet dgou...@ev0ke.net
Date:   Tue Nov 4 00:19:31 2014 -0500

Add comments and rename intro_nodes list in rend_services_introduce()

(No changes file needed: this patch just adds comments and renames
variables. This is ticket 13646. message taken from the ticket. -Nick)
---
 src/or/rendservice.c |   19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 392f393..c586132 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -3028,15 +3028,16 @@ rend_services_introduce(void)
   int intro_point_set_changed, prev_intro_nodes;
   unsigned int n_intro_points_unexpired;
   unsigned int n_intro_points_to_open;
-  smartlist_t *intro_nodes;
   time_t now;
   const or_options_t *options = get_options();
+  /* List of nodes we need to _exclude_ when choosing a new node to establish
+   * an intro point to. */
+  smartlist_t *exclude_nodes = smartlist_new();
 
-  intro_nodes = smartlist_new();
   now = time(NULL);
 
   for (i=0; i  smartlist_len(rend_service_list); ++i) {
-smartlist_clear(intro_nodes);
+smartlist_clear(exclude_nodes);
 service = smartlist_get(rend_service_list, i);
 
 tor_assert(service);
@@ -3135,8 +3136,10 @@ rend_services_introduce(void)
   if (intro != NULL  intro-time_expiring == -1)
 ++n_intro_points_unexpired;
 
+  /* Add the valid node to the exclusion list so we don't try to establish
+   * an introduction point to it again. */
   if (node)
-smartlist_add(intro_nodes, (void*)node);
+smartlist_add(exclude_nodes, (void*)node);
 } SMARTLIST_FOREACH_END(intro);
 
 if (!intro_point_set_changed 
@@ -3172,7 +3175,7 @@ rend_services_introduce(void)
   router_crn_flags_t flags = CRN_NEED_UPTIME|CRN_NEED_DESC;
   if (get_options()-AllowInvalid_  ALLOW_INVALID_INTRODUCTION)
 flags |= CRN_ALLOW_INVALID;
-  node = router_choose_random_node(intro_nodes,
+  node = router_choose_random_node(exclude_nodes,
options-ExcludeNodes, flags);
   if (!node) {
 log_warn(LD_REND,
@@ -3183,7 +3186,9 @@ rend_services_introduce(void)
 break;
   }
   intro_point_set_changed = 1;
-  smartlist_add(intro_nodes, (void*)node);
+  /* Add the choosen node to the exclusion list in order to avoid to pick
+   * it again in the next iteration. */
+  smartlist_add(exclude_nodes, (void*)node);
   intro = tor_malloc_zero(sizeof(rend_intro_point_t));
   intro-extend_info = extend_info_from_node(node, 0);
   intro-intro_key = crypto_pk_new();
@@ -3212,7 +3217,7 @@ rend_services_introduce(void)
   }
 }
   }
-  smartlist_free(intro_nodes);
+  smartlist_free(exclude_nodes);
 }
 
 /** Regenerate and upload rendezvous service descriptors for all

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Check descriptor ID in addition to HS ID when saving a v2 hs descriptor

[nickm]

commit b10e5ac7b86c459a62cfc316c8be87143d2a87e4
Author: Nick Mathewson ni...@torproject.org
Date:   Mon Nov 3 14:02:47 2014 -0500

Check descriptor ID in addition to HS ID when saving a v2 hs descriptor

Fixes bug 13214; reported by 'special'.
---
 changes/bug13214|7 +++
 src/or/directory.c  |3 ++-
 src/or/rendcommon.c |   19 +++
 src/or/rendcommon.h |1 +
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/changes/bug13214 b/changes/bug13214
new file mode 100644
index 000..5b9758b
--- /dev/null
+++ b/changes/bug13214
@@ -0,0 +1,7 @@
+  o Minor bugfixes (hidden services):
+- When fetching hidden service descriptors, check not only for
+  whether we got the hidden service we had in mind, but also
+  whether we got the particular descriptors we wanted. This
+  prevents a class of inefficient but annoying DoS attacks by
+  hidden service directories. Fixes bug 13214; bugfix on
+  0.2.1.6-alpha. Reported by special.
diff --git a/src/or/directory.c b/src/or/directory.c
index 298271f..d429b7b 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2082,7 +2082,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
  (int)body_len, status_code, escaped(reason));
 switch (status_code) {
   case 200:
-switch (rend_cache_store_v2_desc_as_client(body, conn-rend_data)) {
+switch (rend_cache_store_v2_desc_as_client(body,
+  conn-requested_resource, conn-rend_data)) {
   case RCS_BADDESC:
   case RCS_NOTDIR: /* Impossible */
 log_warn(LD_REND,Fetching v2 rendezvous descriptor failed. 
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index a664b5d..e95cf48 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1034,10 +1034,14 @@ rend_cache_store_v2_desc_as_dir(const char *desc)
  * If the descriptor's service ID does not match
  * brend_query/b-\onion_address, reject it.
  *
+ * If the descriptor's descriptor ID doesn't match bdesc_id_base32/b,
+ * reject it.
+ *
  * Return an appropriate rend_cache_store_status_t.
  */
 rend_cache_store_status_t
 rend_cache_store_v2_desc_as_client(const char *desc,
+   const char *desc_id_base32,
const rend_data_t *rend_query)
 {
   /* this seems to have a bit of duplicate code with
@@ -1064,10 +1068,19 @@ rend_cache_store_v2_desc_as_client(const char *desc,
   time_t now = time(NULL);
   char key[REND_SERVICE_ID_LEN_BASE32+2];
   char service_id[REND_SERVICE_ID_LEN_BASE32+1];
+  char want_desc_id[DIGEST_LEN];
   rend_cache_entry_t *e;
   rend_cache_store_status_t retval = RCS_BADDESC;
   tor_assert(rend_cache);
   tor_assert(desc);
+  tor_assert(desc_id_base32);
+  memset(want_desc_id, 0, sizeof(want_desc_id));
+  if (base32_decode(want_desc_id, sizeof(want_desc_id),
+desc_id_base32, strlen(desc_id_base32)) != 0) {
+log_warn(LD_BUG, Couldn't decode base32 %s for descriptor id.,
+ escaped_safe_str_client(desc_id_base32));
+goto err;
+  }
   /* Parse the descriptor. */
   if (rend_parse_v2_service_descriptor(parsed, desc_id, intro_content,
intro_size, encoded_size,
@@ -1086,6 +1099,12 @@ rend_cache_store_v2_desc_as_client(const char *desc,
  service_id, safe_str(rend_query-onion_address));
 goto err;
   }
+  if (tor_memneq(desc_id, want_desc_id, DIGEST_LEN)) {
+log_warn(LD_REND, Received service descriptor for %s with incorrect 
+ descriptor ID., service_id);
+goto err;
+  }
+
   /* Decode/decrypt introduction points. */
   if (intro_content) {
 int n_intro_points;
diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h
index 07a47ac..42a089a 100644
--- a/src/or/rendcommon.h
+++ b/src/or/rendcommon.h
@@ -49,6 +49,7 @@ typedef enum {
 
 rend_cache_store_status_t rend_cache_store_v2_desc_as_dir(const char *desc);
 rend_cache_store_status_t rend_cache_store_v2_desc_as_client(const char *desc,
+   const char *desc_id_base32,
const rend_data_t *rend_query);
 
 int rend_encode_v2_descriptors(smartlist_t *descs_out,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug13214_025_squashed'

[nickm]

commit 593909ea70db9c00d3ae6d3448fb096464e0853d
Merge: 71355e1 b10e5ac
Author: Nick Mathewson ni...@torproject.org
Date:   Tue Nov 4 00:24:56 2014 -0500

Merge remote-tracking branch 'public/bug13214_025_squashed'

 changes/bug13214|7 +++
 src/or/directory.c  |3 ++-
 src/or/rendcommon.c |   19 +++
 src/or/rendcommon.h |1 +
 4 files changed, 29 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Adding changes file for 13315.

[nickm]

commit fc9591da727817923e1084d1a73d5dd8a52e6948
Author: rl1987 rl1...@sdf.lonestar.org
Date:   Tue Oct 14 22:09:44 2014 +0300

Adding changes file for 13315.
---
 changes/bug13315 |5 +
 1 file changed, 5 insertions(+)

diff --git a/changes/bug13315 b/changes/bug13315
new file mode 100644
index 000..c2ae5ff
--- /dev/null
+++ b/changes/bug13315
@@ -0,0 +1,5 @@
+  o Minor features:
+- Validate hostnames in SOCKS5 requests more strictly. If SafeSocks
+  is enabled, reject requests with IP addresses as hostnames. Resolves
+  ticket 13315.
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] fix indentation

[nickm]

commit 74cbd8d55953969c15c60f025889b1e07a185a79
Author: Nick Mathewson ni...@torproject.org
Date:   Tue Nov 4 00:46:32 2014 -0500

fix indentation
---
 src/common/util.c |   56 ++---
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/common/util.c b/src/common/util.c
index 8300299..c6a3989 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -963,9 +963,9 @@ string_is_key_value(int severity, const char *string)
 int
 string_is_valid_ipv4_address(const char *string)
 {
-   struct in_addr addr;
+  struct in_addr addr;
 
-   return (tor_inet_pton(AF_INET,string,addr) == 1);
+  return (tor_inet_pton(AF_INET,string,addr) == 1);
 }
 
 /** Return true if bstring/b represents a valid IPv6 address in
@@ -974,9 +974,9 @@ string_is_valid_ipv4_address(const char *string)
 int
 string_is_valid_ipv6_address(const char *string)
 {
-   struct in6_addr addr;
+  struct in6_addr addr;
 
-   return (tor_inet_pton(AF_INET6,string,addr) == 1);
+  return (tor_inet_pton(AF_INET6,string,addr) == 1);
 }
 
 /** Return true iff bstring/b matches a pattern of DNS names
@@ -985,38 +985,38 @@ string_is_valid_ipv6_address(const char *string)
 int
 string_is_valid_hostname(const char *string)
 {
-   int result = 1;
-   smartlist_t *components;
+  int result = 1;
+  smartlist_t *components;
 
-   components = smartlist_new();
+  components = smartlist_new();
 
-   smartlist_split_string(components,string,.,0,0);
+  smartlist_split_string(components,string,.,0,0);
 
-   SMARTLIST_FOREACH_BEGIN(components, char *, c) {
- if (c[0] == '-') {
-   result = 0;
-   break;
- }
+  SMARTLIST_FOREACH_BEGIN(components, char *, c) {
+if (c[0] == '-') {
+  result = 0;
+  break;
+}
 
- do {
-   if ((*c = 'a'  *c = 'z') ||
-   (*c = 'A'  *c = 'Z') ||
-   (*c = '0'  *c = '9') ||
-   (*c == '-'))
- c++;
-   else
- result = 0;
- } while (result  *c);
+do {
+  if ((*c = 'a'  *c = 'z') ||
+  (*c = 'A'  *c = 'Z') ||
+  (*c = '0'  *c = '9') ||
+  (*c == '-'))
+c++;
+  else
+result = 0;
+} while (result  *c);
 
-   } SMARTLIST_FOREACH_END(c);
+  } SMARTLIST_FOREACH_END(c);
 
-   SMARTLIST_FOREACH_BEGIN(components, char *, c) {
- tor_free(c);
-   } SMARTLIST_FOREACH_END(c);
+  SMARTLIST_FOREACH_BEGIN(components, char *, c) {
+tor_free(c);
+  } SMARTLIST_FOREACH_END(c);
 
-   smartlist_free(components);
+  smartlist_free(components);
 
-   return result;
+  return result;
 }
 
 /** Return true iff the DIGEST256_LEN bytes in digest are all zero. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Validating SOCKS5 hostname more correctly.

[nickm]

commit 2862b769de40347ffe808349c4e139e7eb45
Author: rl1987 rl1...@sdf.lonestar.org
Date:   Sun Oct 12 21:04:15 2014 +0300

Validating SOCKS5 hostname more correctly.
---
 src/or/buffers.c  |   10 +-
 src/test/test_socks.c |   11 +++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/or/buffers.c b/src/or/buffers.c
index d174f81..e98f569 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -2048,7 +2048,15 @@ parse_socks(const char *data, size_t datalen, 
socks_request_t *req,
   req-address[len] = 0;
   req-port = ntohs(get_uint16(data+5+len));
   *drain_out = 5+len+2;
-  if (!tor_strisprint(req-address) || strchr(req-address,'\')) {
+
+  if (string_is_valid_ipv4_address(req-address)) {
+log_unsafe_socks_warning(5,req-address,req-port,safe_socks);
+
+if (safe_socks)
+  return -1;
+  }
+
+  if (!string_is_valid_hostname(req-address)) {
 log_warn(LD_PROTOCOL,
  Your application (using socks5 to port %d) gave Tor 
  a malformed hostname: %s. Rejecting the connection.,
diff --git a/src/test/test_socks.c b/src/test/test_socks.c
index 2b8f824..b9520b5 100644
--- a/src/test/test_socks.c
+++ b/src/test/test_socks.c
@@ -229,6 +229,17 @@ test_socks_5_supported_commands(void *ptr)
   tt_int_op(0,==, buf_datalen(buf));
   socks_request_clear(socks);
 
+  /* SOCKS 5 Should reject RESOLVE [F0] request for IPv4 address
+   * string if SafeSocks is enabled. */
+
+  ADD_DATA(buf, \x05\x01\x00);
+  ADD_DATA(buf, \x05\xF0\x00\x03\x07);
+  ADD_DATA(buf, 8.8.8.8);
+  ADD_DATA(buf, \x01\x02);
+  tt_assert(fetch_from_buf_socks(buf,socks,get_options()-TestSocks,1)
+== -1);
+  socks_request_clear(socks);
+
   /* SOCKS 5 Send RESOLVE_PTR [F1] for IP address 2.2.2.5 */
   ADD_DATA(buf, \x05\x01\x00);
   ADD_DATA(buf, \x05\xF1\x00\x01\x02\x02\x02\x05\x01\x03);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'bug13315_squashed'

[nickm]

commit 60c86a3b79d542543f191a78f5c7ea2c77c0d3f0
Merge: 593909e 74cbd8d
Author: Nick Mathewson ni...@torproject.org
Date:   Tue Nov 4 00:48:25 2014 -0500

Merge branch 'bug13315_squashed'

Conflicts:
src/or/buffers.c

 changes/bug13315  |5 
 src/common/util.c |   62 +
 src/common/util.h |3 +++
 src/or/buffers.c  |   14 ++-
 src/test/test_socks.c |   36 
 src/test/test_util.c  |   48 ++
 6 files changed, 167 insertions(+), 1 deletion(-)

diff --cc src/or/buffers.c
index 080d8fb,691845e..bd33fe4
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@@ -2054,8 -2048,18 +2054,20 @@@ parse_socks(const char *data, size_t da
req-address[len] = 0;
req-port = ntohs(get_uint16(data+5+len));
*drain_out = 5+len+2;
-   if (!tor_strisprint(req-address) || strchr(req-address,'\')) {
+ 
+   if (string_is_valid_ipv4_address(req-address) ||
+   string_is_valid_ipv6_address(req-address)) {
+ log_unsafe_socks_warning(5,req-address,req-port,safe_socks);
+ 
+ if (safe_socks) {
+   socks_request_set_socks5_error(req, SOCKS5_NOT_ALLOWED);
+   return -1;
+ }
+   }
+ 
+   if (!string_is_valid_hostname(req-address)) {
 +socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR);
++
  log_warn(LD_PROTOCOL,
   Your application (using socks5 to port %d) gave Tor 
   a malformed hostname: %s. Rejecting the connection.,

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Checking if FQDN is actually IPv6 address string and handling that case.

[nickm]

commit 0da4ddda4f8f1c3c931349e45acbdcae2b7cc750
Author: rl1987 rl1...@sdf.lonestar.org
Date:   Tue Oct 14 21:56:04 2014 +0300

Checking if FQDN is actually IPv6 address string and handling that case.
---
 src/common/util.c |2 +-
 src/or/buffers.c  |3 ++-
 src/test/test_socks.c |   11 +++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/common/util.c b/src/common/util.c
index e9ee437..c292c79 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -976,7 +976,7 @@ string_is_valid_ipv6_address(const char *string)
 {
struct sockaddr_in sockaddr_dummy;
 
-   return (inet_pton(AF_INET6,string,sockaddr_dummy) == 1);
+   return (tor_inet_pton(AF_INET6,string,sockaddr_dummy) == 1);
 }
 
 /** Return true iff bstring/b matches a pattern of DNS names
diff --git a/src/or/buffers.c b/src/or/buffers.c
index e98f569..354bec6 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -2049,7 +2049,8 @@ parse_socks(const char *data, size_t datalen, 
socks_request_t *req,
   req-port = ntohs(get_uint16(data+5+len));
   *drain_out = 5+len+2;
 
-  if (string_is_valid_ipv4_address(req-address)) {
+  if (string_is_valid_ipv4_address(req-address) ||
+  string_is_valid_ipv6_address(req-address)) {
 log_unsafe_socks_warning(5,req-address,req-port,safe_socks);
 
 if (safe_socks)
diff --git a/src/test/test_socks.c b/src/test/test_socks.c
index b9520b5..ba6b9a9 100644
--- a/src/test/test_socks.c
+++ b/src/test/test_socks.c
@@ -240,6 +240,17 @@ test_socks_5_supported_commands(void *ptr)
 == -1);
   socks_request_clear(socks);
 
+  /* SOCKS 5 should reject RESOLVE [F0] reject for IPv6 address
+   * string if SafeSocks is enabled. */
+
+  ADD_DATA(buf, \x05\x01\x00);
+  ADD_DATA(buf, \x05\xF0\x00\x03\x27);
+  ADD_DATA(buf, 2001:0db8:85a3:::8a2e:0370:7334);
+  ADD_DATA(buf, \x01\x02);
+  tt_assert(fetch_from_buf_socks(buf,socks,get_options()-TestSocks,1)
+== -1);
+  socks_request_clear(socks);
+
   /* SOCKS 5 Send RESOLVE_PTR [F1] for IP address 2.2.2.5 */
   ADD_DATA(buf, \x05\x01\x00);
   ADD_DATA(buf, \x05\xF1\x00\x01\x02\x02\x02\x05\x01\x03);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Introducing helper function to validate DNS name strings.

[nickm]

commit 1ea9a6fd72b66ec634446cbd2119641a5ed1e703
Author: rl1987 rl1...@sdf.lonestar.org
Date:   Sun Oct 12 19:33:08 2014 +0300

Introducing helper function to validate DNS name strings.
---
 src/common/util.c|   36 
 src/common/util.h|1 +
 src/test/test_util.c |   31 +++
 3 files changed, 68 insertions(+)

diff --git a/src/common/util.c b/src/common/util.c
index f4d293c..606b9e1 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -957,6 +957,42 @@ string_is_key_value(int severity, const char *string)
   return 1;
 }
 
+/** Return true iff bstring/b is valid DNS name, as defined in
+ * RFC 1035 Section 2.3.1.
+ */
+int
+string_is_valid_hostname(const char *string)
+{
+   int result = 1;
+   smartlist_t *components;
+
+   components = smartlist_new();
+
+   smartlist_split_string(components,string,.,0,0);
+
+   SMARTLIST_FOREACH_BEGIN(components, char *, c) {
+ if (c[0] == '-') {
+   result = 0;
+   break;
+ }
+
+ do {
+   if ((*c = 'a'  *c = 'z') ||
+   (*c = 'A'  *c = 'Z') ||
+   (*c = '0'  *c = '9') ||
+   (*c == '-'))
+ c++;
+   else
+ result = 0;
+ } while (result  *c);
+
+   } SMARTLIST_FOREACH_END(c);
+
+   smartlist_free(components);
+
+   return result;
+}
+
 /** Return true iff the DIGEST256_LEN bytes in digest are all zero. */
 int
 tor_digest256_is_zero(const char *digest)
diff --git a/src/common/util.h b/src/common/util.h
index 61bb05f..2634adc 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -227,6 +227,7 @@ const char *find_str_at_start_of_line(const char *haystack,
   const char *needle);
 int string_is_C_identifier(const char *string);
 int string_is_key_value(int severity, const char *string);
+int string_is_valid_hostname(const char *string);
 
 int tor_mem_is_zero(const char *mem, size_t len);
 int tor_digest_is_zero(const char *digest);
diff --git a/src/test/test_util.c b/src/test/test_util.c
index c67aa71..fb3ce7d 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -4122,6 +4122,36 @@ test_util_max_mem(void *arg)
   ;
 }
 
+static void
+test_util_hostname_validation(void *arg)
+{
+  (void)arg;
+
+  // Lets try valid hostnames first.
+  tt_assert(string_is_valid_hostname(torproject.org));
+  tt_assert(string_is_valid_hostname(ocw.mit.edu));
+  tt_assert(string_is_valid_hostname(i.4cdn.org));
+  tt_assert(string_is_valid_hostname(stanford.edu));
+  tt_assert(string_is_valid_hostname(multiple-words-with-hypens.jp));
+
+  // Subdomain name cannot start with '-'.
+  tt_assert(!string_is_valid_hostname(-torproject.org));
+  tt_assert(!string_is_valid_hostname(subdomain.-domain.org));
+  tt_assert(!string_is_valid_hostname(-subdomain.domain.org));
+  
+  // Hostnames cannot contain non-alphanumeric characters.
+  tt_assert(!string_is_valid_hostname(%%domain.\\org.));  
+  tt_assert(!string_is_valid_hostname(***x.net));
+  tt_assert(!string_is_valid_hostname(___abc.org));
+  tt_assert(!string_is_valid_hostname(\xff\xffxyz.org));
+  tt_assert(!string_is_valid_hostname(word1 word2.net));
+
+  // XXX: do we allow single-label DNS names?
+
+  done:
+  return;
+}
+
 struct testcase_t util_tests[] = {
   UTIL_LEGACY(time),
   UTIL_TEST(parse_http_time, 0),
@@ -4194,6 +4224,7 @@ struct testcase_t util_tests[] = {
   { socketpair_ersatz, test_util_socketpair, TT_FORK,
 socketpair_setup, (void*)1 },
   UTIL_TEST(max_mem, 0),
+  UTIL_TEST(hostname_validation, 0),
   END_OF_TESTCASES
 };
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Adding helper function that checks if string is a valid IPv6 address.

[nickm]

commit 2f1068e68a95a2ad9ba058297b54622323b216c6
Author: rl1987 rl1...@sdf.lonestar.org
Date:   Tue Oct 14 21:53:48 2014 +0300

Adding helper function that checks if string is a valid IPv6 address.
---
 src/common/util.c |   11 +++
 src/common/util.h |1 +
 2 files changed, 12 insertions(+)

diff --git a/src/common/util.c b/src/common/util.c
index ba9d78a..e9ee437 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -968,6 +968,17 @@ string_is_valid_ipv4_address(const char *string)
return (tor_inet_pton(AF_INET,string,sockaddr) == 1);
 }
 
+/** Return true if bstring/b represents a valid IPv6 address in
+ * a form that inet_pton() can parse.
+ */
+int
+string_is_valid_ipv6_address(const char *string)
+{
+   struct sockaddr_in sockaddr_dummy;
+
+   return (inet_pton(AF_INET6,string,sockaddr_dummy) == 1);
+}
+
 /** Return true iff bstring/b matches a pattern of DNS names
  * that we allow Tor clients to connect to.
  */
diff --git a/src/common/util.h b/src/common/util.h
index dcb54f0..5eecfad 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -229,6 +229,7 @@ int string_is_C_identifier(const char *string);
 int string_is_key_value(int severity, const char *string);
 int string_is_valid_hostname(const char *string);
 int string_is_valid_ipv4_address(const char *string);
+int string_is_valid_ipv6_address(const char *string);
 
 int tor_mem_is_zero(const char *mem, size_t len);
 int tor_digest_is_zero(const char *digest);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Sending 'Not allowed' error message before closing the connection.

[nickm]

commit 51e247361824fa64f4322fb59e9d2cffd9d72cba
Author: rl1987 rl1...@sdf.lonestar.org
Date:   Tue Oct 21 20:50:32 2014 +0300

Sending 'Not allowed' error message before closing the connection.
---
 src/or/buffers.c  |4 +++-
 src/test/test_socks.c |   14 ++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 354bec6..691845e 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -2053,8 +2053,10 @@ parse_socks(const char *data, size_t datalen, 
socks_request_t *req,
   string_is_valid_ipv6_address(req-address)) {
 log_unsafe_socks_warning(5,req-address,req-port,safe_socks);
 
-if (safe_socks)
+if (safe_socks) {
+  socks_request_set_socks5_error(req, SOCKS5_NOT_ALLOWED);
   return -1;
+}
   }
 
   if (!string_is_valid_hostname(req-address)) {
diff --git a/src/test/test_socks.c b/src/test/test_socks.c
index ba6b9a9..a3fe07f 100644
--- a/src/test/test_socks.c
+++ b/src/test/test_socks.c
@@ -238,6 +238,13 @@ test_socks_5_supported_commands(void *ptr)
   ADD_DATA(buf, \x01\x02);
   tt_assert(fetch_from_buf_socks(buf,socks,get_options()-TestSocks,1)
 == -1);
+
+  tt_int_op(5,==,socks-socks_version);
+  tt_int_op(10,==,socks-replylen);
+  tt_int_op(5,==,socks-reply[0]);
+  tt_int_op(SOCKS5_NOT_ALLOWED,==,socks-reply[1]);
+  tt_int_op(1,==,socks-reply[3]);
+
   socks_request_clear(socks);
 
   /* SOCKS 5 should reject RESOLVE [F0] reject for IPv6 address
@@ -249,6 +256,13 @@ test_socks_5_supported_commands(void *ptr)
   ADD_DATA(buf, \x01\x02);
   tt_assert(fetch_from_buf_socks(buf,socks,get_options()-TestSocks,1)
 == -1);
+
+  tt_int_op(5,==,socks-socks_version);
+  tt_int_op(10,==,socks-replylen);
+  tt_int_op(5,==,socks-reply[0]);
+  tt_int_op(SOCKS5_NOT_ALLOWED,==,socks-reply[1]);
+  tt_int_op(1,==,socks-reply[3]);
+
   socks_request_clear(socks);
 
   /* SOCKS 5 Send RESOLVE_PTR [F1] for IP address 2.2.2.5 */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Use correct argument types for inet_pton.

[nickm]

commit 254ab5a8deb9ed5fb571016f402ffd7243208d73
Author: Nick Mathewson ni...@torproject.org
Date:   Tue Nov 4 00:45:14 2014 -0500

Use correct argument types for inet_pton.

(I blame whoever decided that using a void* for a union was a good
idea.)
---
 src/common/util.c |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/util.c b/src/common/util.c
index c292c79..8300299 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -963,9 +963,9 @@ string_is_key_value(int severity, const char *string)
 int
 string_is_valid_ipv4_address(const char *string)
 {
-   struct sockaddr_in sockaddr;
+   struct in_addr addr;
 
-   return (tor_inet_pton(AF_INET,string,sockaddr) == 1);
+   return (tor_inet_pton(AF_INET,string,addr) == 1);
 }
 
 /** Return true if bstring/b represents a valid IPv6 address in
@@ -974,9 +974,9 @@ string_is_valid_ipv4_address(const char *string)
 int
 string_is_valid_ipv6_address(const char *string)
 {
-   struct sockaddr_in sockaddr_dummy;
+   struct in6_addr addr;
 
-   return (tor_inet_pton(AF_INET6,string,sockaddr_dummy) == 1);
+   return (tor_inet_pton(AF_INET6,string,addr) == 1);
 }
 
 /** Return true iff bstring/b matches a pattern of DNS names



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Introducing helper function to validate IPv4 address strings.

[nickm]

commit e8e45ff13ed86d8851bab77d65d899d0ca6e3b89
Author: rl1987 rl1...@sdf.lonestar.org
Date:   Sun Oct 12 20:39:00 2014 +0300

Introducing helper function to validate IPv4 address strings.
---
 src/common/util.c|   19 +--
 src/common/util.h|1 +
 src/test/test_util.c |   21 +++--
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/common/util.c b/src/common/util.c
index 606b9e1..ba9d78a 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -957,8 +957,19 @@ string_is_key_value(int severity, const char *string)
   return 1;
 }
 
-/** Return true iff bstring/b is valid DNS name, as defined in
- * RFC 1035 Section 2.3.1.
+/** Return true if bstring/b represents a valid IPv4 adddress in
+ * 'a.b.c.d' form.
+ */
+int
+string_is_valid_ipv4_address(const char *string)
+{
+   struct sockaddr_in sockaddr;
+
+   return (tor_inet_pton(AF_INET,string,sockaddr) == 1);
+}
+
+/** Return true iff bstring/b matches a pattern of DNS names
+ * that we allow Tor clients to connect to.
  */
 int
 string_is_valid_hostname(const char *string)
@@ -988,6 +999,10 @@ string_is_valid_hostname(const char *string)
 
} SMARTLIST_FOREACH_END(c);
 
+   SMARTLIST_FOREACH_BEGIN(components, char *, c) {
+ tor_free(c);
+   } SMARTLIST_FOREACH_END(c);
+
smartlist_free(components);
 
return result;
diff --git a/src/common/util.h b/src/common/util.h
index 2634adc..dcb54f0 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -228,6 +228,7 @@ const char *find_str_at_start_of_line(const char *haystack,
 int string_is_C_identifier(const char *string);
 int string_is_key_value(int severity, const char *string);
 int string_is_valid_hostname(const char *string);
+int string_is_valid_ipv4_address(const char *string);
 
 int tor_mem_is_zero(const char *mem, size_t len);
 int tor_digest_is_zero(const char *digest);
diff --git a/src/test/test_util.c b/src/test/test_util.c
index fb3ce7d..fba90da 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -4138,9 +4138,9 @@ test_util_hostname_validation(void *arg)
   tt_assert(!string_is_valid_hostname(-torproject.org));
   tt_assert(!string_is_valid_hostname(subdomain.-domain.org));
   tt_assert(!string_is_valid_hostname(-subdomain.domain.org));
-  
+
   // Hostnames cannot contain non-alphanumeric characters.
-  tt_assert(!string_is_valid_hostname(%%domain.\\org.));  
+  tt_assert(!string_is_valid_hostname(%%domain.\\org.));
   tt_assert(!string_is_valid_hostname(***x.net));
   tt_assert(!string_is_valid_hostname(___abc.org));
   tt_assert(!string_is_valid_hostname(\xff\xffxyz.org));
@@ -4152,6 +4152,22 @@ test_util_hostname_validation(void *arg)
   return;
 }
 
+static void
+test_util_ipv4_validation(void *arg)
+{
+  (void)arg;
+
+  tt_assert(string_is_valid_ipv4_address(192.168.0.1));
+  tt_assert(string_is_valid_ipv4_address(8.8.8.8));
+
+  tt_assert(!string_is_valid_ipv4_address(abcd));
+  tt_assert(!string_is_valid_ipv4_address(300.300.300.300));
+  tt_assert(!string_is_valid_ipv4_address(8.8.));
+
+  done:
+  return;
+}
+
 struct testcase_t util_tests[] = {
   UTIL_LEGACY(time),
   UTIL_TEST(parse_http_time, 0),
@@ -4225,6 +4241,7 @@ struct testcase_t util_tests[] = {
 socketpair_setup, (void*)1 },
   UTIL_TEST(max_mem, 0),
   UTIL_TEST(hostname_validation, 0),
+  UTIL_TEST(ipv4_validation, 0),
   END_OF_TESTCASES
 };
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits