June 2017 - tor-commits - lists.torproject.org

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 20 Jun '17

20 Jun '17

commit f471d0cb179f21083d040b09b7916d974fb573f8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 20 08:45:44 2017 +0000 Update translations for tails-greeter --- tr/tr.po | 88 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index b5716e9..09f07e1 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -13,14 +13,14 @@ # sgtpepper <barlasmirc(a)gmail.com>, 2013 # tim.tanurhan <timtanurhan(a)hotmail.com>, 2014 # tim.tanurhan <timtanurhan(a)hotmail.com>, 2014 -# Volkan Gezer <volkangezer(a)gmail.com>, 2014,2016 +# Volkan Gezer <volkangezer(a)gmail.com>, 2014,2016-2017 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-10 08:28+0200\n" -"PO-Revision-Date: 2017-06-10 10:19+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2017-06-10 12:27+0200\n" +"PO-Revision-Date: 2017-06-20 08:40+0000\n" +"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,51 +30,51 @@ msgstr "" #: ../data/greeter.ui.h:1 msgid "Administration Password" -msgstr "" +msgstr "Yönetici Parolası" #: ../data/greeter.ui.h:2 msgid "" "Set up an administration password if you need to perform administrative " "tasks. Otherwise, the administration password is disabled for better " "security." -msgstr "" +msgstr "Yönetimsel görevleri gerçekleştirmeniz gerekiyorsa bir yönetici parolası oluşturun. Diğer durumlarda, daha fazla güvenlik için yönetici parolası devre dışı bırakılır." #: ../data/greeter.ui.h:3 msgid "Enter an administration password" -msgstr "" +msgstr "Bir yönetici parolası girin" #: ../data/greeter.ui.h:4 msgid "Confirm" -msgstr "" +msgstr "Onayla" #: ../data/greeter.ui.h:5 msgid "Confirm your administration password" -msgstr "" +msgstr "Yönetici parolanızı onaylayın" #: ../data/greeter.ui.h:6 msgid "Disable" -msgstr "" +msgstr "Devre Dışı Bırak" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:8 msgid "Windows Camouflage" -msgstr "" +msgstr "Windows Kamuflajı" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:10 msgid "" "This option makes Tails look like Microsoft Windows 10. This can be useful " "to avoid attracting suspicion in public places." -msgstr "" +msgstr "Bu seçenek Tails'in Microsoft Windows 10 gibi görünmesini sağlayacak. Ortak yerlerde şüphe oluşumunu engellemek için kullanışlı olabilir." #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:12 msgid "Microsoft Windows 10 camouflage" -msgstr "" +msgstr "Microsoft Windows 10 kamuflajı" #: ../data/greeter.ui.h:13 msgid "MAC Address Spoofing" -msgstr "" +msgstr "MAC Adres Aldatması" #: ../data/greeter.ui.h:14 msgid "" @@ -82,124 +82,124 @@ msgid "" "Fi or wired) to the local network. Spoofing MAC addresses is generally safer" " as it helps you hide your geographical location. But it might also create " "connectivity problems or look suspicious." -msgstr "" +msgstr "MAC adresi aldatma, ağ arabiriminizin seri numarasını (kablosuz veya kablolu) yerel ağda gizler. Coğrafi konumunuzu gizlemenize yardımcı olduğu için MAC adresi aldatmaları genellikle daha güvenlidir. Ancak bağlantı sorunları yaratabilir veya şüphe uyandırabilir." #: ../data/greeter.ui.h:15 msgid "Spoof all MAC addresses (default)" -msgstr "" +msgstr "Tümünde MAC adresi aldatmayı kullan (varsayılan)" #: ../data/greeter.ui.h:16 msgid "Don't spoof MAC addresses" -msgstr "" +msgstr "MAC adresi aldatmayı kullanma" #: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532 msgid "Cannot unlock encrypted storage with this passphrase." -msgstr "" +msgstr "Bu parola ifadesi ile şifrelenmiş depolama kilidi açılamadı." #: ../data/greeter.ui.h:18 msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." -msgstr "" +msgstr "Tor köprüsü ve yerel vekil sunucusunu, bir ağa bağlandıktan sonra yapılandıracaksınız." #: ../data/greeter.ui.h:19 msgid "Welcome to Tails!" -msgstr "" +msgstr "Tails'e Hoş Geldiniz!" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:21 msgctxt "" msgid "" "To get guided through Tails' settings, click on <b>Take a Tour</b> above" -msgstr "" +msgstr "Tail ayarları için yardım almak üzere yıkarıdaki <b>Tura Katıl</b> tıklayın" #: ../data/greeter.ui.h:22 msgid "Language & Region" -msgstr "" +msgstr "Dil ve Bölge" #: ../data/greeter.ui.h:23 msgid "Default Settings" -msgstr "" +msgstr "Varsayılan Ayarlar" #: ../data/greeter.ui.h:24 msgid "Save Language & Region Settings" -msgstr "" +msgstr "Dil ve Bölge Ayarlarını Kaydet" #: ../data/greeter.ui.h:25 msgid "_Language" -msgstr "" +msgstr "_Dil" #: ../data/greeter.ui.h:26 msgid "_Keyboard Layout" -msgstr "" +msgstr "_Klavye Düzeni" #: ../data/greeter.ui.h:27 msgid "_Formats" -msgstr "" +msgstr "_Biçimler" #: ../data/greeter.ui.h:28 msgid "_Time Zone" -msgstr "" +msgstr "_Zaman Dilimi" #: ../data/greeter.ui.h:29 msgid "Encrypted _Persistent Storage" -msgstr "" +msgstr "Şifrelenmiş _Kalıcı Depolama" #: ../data/greeter.ui.h:30 msgid "Show Passphrase" -msgstr "" +msgstr "Parola İfadesini Göster" #: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" -msgstr "" +msgstr "Kalıcı Depolamayı Yapılandır" #: ../data/greeter.ui.h:32 msgid "Enter your passphrase to unlock the persistent storage" -msgstr "" +msgstr "Kalıcı depolama kilidini açmak için parola ifadenizi girin" #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478 #: ../tailsgreeter/gui.py:528 msgid "Unlock" -msgstr "" +msgstr "Kilidi Aç" #: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" -msgstr "" +msgstr "Kalıcı Depolamayı Yeniden Kilitle" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." -msgstr "" +msgstr "Kalıcı depolamanızın kilidi açıldı. Tekrar kilitlemek için Tails'i yeniden başlatın." #: ../data/greeter.ui.h:36 msgid "_Additional Settings" -msgstr "" +msgstr "_Ek Ayarlar" #: ../data/greeter.ui.h:37 msgid "Save Additional Settings" -msgstr "" +msgstr "Ek Ayarları Kaydet" #: ../data/greeter.ui.h:38 msgid "Add an additional setting" -msgstr "" +msgstr "Ek bir ayar ekle" #: ../data/greeter.ui.h:39 msgid "Network Configuration" -msgstr "" +msgstr "Ağ Yapılandırması" #: ../data/greeter.ui.h:40 msgid "" "If your Internet connection is censored, filtered, or proxied you can " "configure a Tor bridge or a local proxy. To work completely offline, you can" " disable all networking." -msgstr "" +msgstr "İnternet bağlantınız sansürleniyorsa, filtreleniyorsa veya vekil sunucusu kullanıyorsa, Tor köprüsü veya yerel bir vekil sunucu yapılandırabilirsiniz. Tamamıyla çevrimdışı çalışmak için, tüm ağları devre dışı bırakabilirsiniz." #: ../data/greeter.ui.h:41 msgid "Connect directly to the Tor network (default)" -msgstr "" +msgstr "Doğrudan Tor ağına bağlan (varsayılan)" #: ../data/greeter.ui.h:42 msgid "Configure a Tor bridge or local proxy" -msgstr "" +msgstr "Tor köprüsü veya yerel vekil sunucu yapılandırTor köprüsü veya yerel vekil sunucu yapılandır" #: ../data/greeter.ui.h:43 msgid "Disable all networking" @@ -209,11 +209,11 @@ msgstr "Tüm ağı devre dışı bırak" msgid "" "The default settings are safe in most situations. To add a custom setting, " "press the \"+\" button below." -msgstr "" +msgstr "Varsayılan ayarlar çoğu durumda güvenlidir. Özel bir ayar eklemek için aşağıdaki \"+\" düğmesine basın." #: ../data/greeter.ui.h:45 msgid "_Administration Password" -msgstr "" +msgstr "_Yönetici Parolası" #: ../data/greeter.ui.h:46 msgid "Off (default)"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 20 Jun '17

20 Jun '17

commit ed84898ed0888e6ef141809a4636c5948d0d82af Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 20 08:45:29 2017 +0000 Update translations for liveusb-creator --- tr/tr.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index 1878248..5565cb8 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -15,15 +15,15 @@ # muaz yadiyüzkırkiki, 2013 # muaz yadiyüzkırkiki, 2013 # Ozancan Karataş <ozanc27(a)icloud.com>, 2015 -# Volkan Gezer <volkangezer(a)gmail.com>, 2013-2014,2016 +# Volkan Gezer <volkangezer(a)gmail.com>, 2013-2014,2016-2017 # Yasin Özel <iletisim(a)yasinozel.com.tr>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-10 07:50+0200\n" -"PO-Revision-Date: 2017-06-17 13:27+0000\n" -"Last-Translator: Ali Kömesöğütlü <byzlo685(a)gmail.com>\n" +"PO-Revision-Date: 2017-06-20 08:43+0000\n" +"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -138,7 +138,7 @@ msgstr "Dosya sistemi desteklenmiyor: %s" #: ../tails_installer/creator.py:760 #, python-format msgid "Unknown GLib exception while trying to mount device: %(message)s" -msgstr "" +msgstr "Aygıt bağlanmaya çalışılırken bilinmeyen Glib istisnası: %(message)s" #: ../tails_installer/creator.py:764 #, python-format @@ -204,7 +204,7 @@ msgstr "Bootloader yükleniyor..." #: ../tails_installer/creator.py:1016 #, python-format msgid "Could not find the '%s' COM32 module" -msgstr "" +msgstr "'%s' COM32 modülü bulunamadı" #: ../tails_installer/creator.py:1024 ../tails_installer/creator.py:1405 #, python-format @@ -227,7 +227,7 @@ msgstr "%(device)s FAT32 olarak biçimlendiriliyor" #: ../tails_installer/creator.py:1239 msgid "Could not find syslinux' gptmbr.bin" -msgstr "" +msgstr "syslinux' gptmbr.bin bulunamadı" #: ../tails_installer/creator.py:1252 #, python-format @@ -499,11 +499,11 @@ msgstr "" #: ../data/tails-installer.ui.h:2 msgid "Select a distribution to download:" -msgstr "" +msgstr "İndirmek üzere bir dağıtım seçin:" #: ../data/tails-installer.ui.h:3 msgid "Target Device:" -msgstr "" +msgstr "Hedef Aygıt:" #: ../data/tails-installer.ui.h:4 msgid "Install Tails" @@ -514,7 +514,7 @@ msgid "" "To run Tails Installer you need an ISO image which can be downloaded from " "the Tails website: <a " "href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>" -msgstr "" +msgstr "Tails yükleyiciyi çalıştırmak için Tails web sitesinden indirilebilecek bir ISO kalıbına ihtiyacınız var: <a href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>" #: ../data/tails-installer-launcher.ui.h:2 msgid "Install" @@ -522,11 +522,11 @@ msgstr "Yükle" #: ../data/tails-installer-launcher.ui.h:3 msgid "• Install Tails on a new USB stick." -msgstr "" +msgstr "• Tails', bir USB bellek üzerine yükle" #: ../data/tails-installer-launcher.ui.h:4 msgid "• The USB stick that you install on is formatted and all data is lost." -msgstr "" +msgstr "• Üzerine yükleme yapılacak USB bellek biçimlendirilecek ve tüm veriler kaybolacak." #: ../data/tails-installer-launcher.ui.h:5 msgid "Upgrade" @@ -534,23 +534,23 @@ msgstr "Güncelle" #: ../data/tails-installer-launcher.ui.h:6 msgid "• Upgrade a Tails USB stick to the version of an ISO image." -msgstr "" +msgstr "• Tails USB belleğini, ISO kalıbındaki sürüme yükselt." #: ../data/tails-installer-launcher.ui.h:7 msgid "" "• The encrypted persistent storage of the Tails USB stick that you upgrade " "is preserved." -msgstr "" +msgstr "• Yükseltme yaptığınız Tails USB belleğindeki şifreli kalıcı depolama korunacak." #: ../data/tails-installer-launcher.ui.h:8 msgid "" "Need help? Read the <a " "href=\"https://tails.boum.org/doc/first_steps/installation/\">documentation</a>" -msgstr "" +msgstr "Yardım mı gerekli? <a href=\"https://tails.boum.org/doc/first_steps/installation/\">Belgelendirmeyi</a> okuyun" #: ../data/tails-installer-launcher.ui.h:9 msgid "Install by cloning" -msgstr "" +msgstr "Klonlayarak yükle" #: ../data/tails-installer-launcher.ui.h:10 msgid "" @@ -586,4 +586,4 @@ msgstr "" msgid "" "Need help? Read the <a " "href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">documentation</a>" -msgstr "" +msgstr "Yardım mı gerekli? <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">Belgelendirmeyi</a> okuyun"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 20 Jun '17

20 Jun '17

commit 6df2b62f7b0ad74fb9ecd3673a182a80330807bd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 20 05:45:41 2017 +0000 Update translations for tails-greeter --- el/el.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/el/el.po b/el/el.po index 06b81c1..194201b 100644 --- a/el/el.po +++ b/el/el.po @@ -10,14 +10,15 @@ # kotkotkot <kotakota(a)gmail.com>, 2012 # metamec, 2015 # Natalia <hli8ia(a)gmail.com>, 2015 +# ilias_ <teneatis(a)gmail.com>, 2017 # Wasilis Mandratzis <inactive+Wasilis(a)transifex.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-10 08:28+0200\n" -"PO-Revision-Date: 2017-06-10 10:19+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2017-06-10 12:27+0200\n" +"PO-Revision-Date: 2017-06-20 05:28+0000\n" +"Last-Translator: ilias_ <teneatis(a)gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,7 +43,7 @@ msgstr "" #: ../data/greeter.ui.h:4 msgid "Confirm" -msgstr "" +msgstr "Επιβεβαίωση" #: ../data/greeter.ui.h:5 msgid "Confirm your administration password"

1 0

[sandboxed-tor-browser/master] Fix the build being broken on Debian Jessie due to #22648.
by yawning＠torproject.org 20 Jun '17

20 Jun '17

commit 75faec7ba100845641422d72e47dffbdafe9c180 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Jun 20 04:14:43 2017 +0000 Fix the build being broken on Debian Jessie due to #22648. I guess I should have included this for completeness sake anyway, but it built fine on F25 and Arch. --- ChangeLog | 1 + src/cmd/sandboxed-tor-browser/internal/sandbox/x11/surrogate.go | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3ba6979..742153f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ Changes in version 0.0.9 - UNRELEASED: + * Fix the build being broken on Debian Jessie due to #22648. Changes in version 0.0.8 - 2017-06-19: * Bug 20776: Remove the X11 `MIT-SHM` workaround from the stub. diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/x11/surrogate.go b/src/cmd/sandboxed-tor-browser/internal/sandbox/x11/surrogate.go index 90a2663..3db8aca 100644 --- a/src/cmd/sandboxed-tor-browser/internal/sandbox/x11/surrogate.go +++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/x11/surrogate.go @@ -18,6 +18,7 @@ package x11 // #cgo LDFLAGS: -lxcb // +// #include <xcb/xcb.h> // #include <xcb/xproto.h> // #include <stdlib.h> // #include <string.h>

1 0

[chutney/master] Add a minimal network with a hidden service and an exit
by teor＠torproject.org 20 Jun '17

20 Jun '17

commit 72fa2618de0f40eab0ef15e6eca6d642c073c0db Author: teor <teor2345(a)gmail.com> Date: Mon Jun 19 17:01:00 2017 +1000 Add a minimal network with a hidden service and an exit Implements #22667. --- networks/hs-exit-min | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/networks/hs-exit-min b/networks/hs-exit-min new file mode 100644 index 0000000..4a1705e --- /dev/null +++ b/networks/hs-exit-min @@ -0,0 +1,13 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") +Client = Node(tag="c", torrc="client.tmpl") +HS = Node(tag="h", hs=1, torrc="hs.tmpl") + +# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag +# in 0.2.6 +# We need 5 authorities/relays/exits to ensure we can build HS connections +NODES = Authority.getN(2) + ExitRelay.getN(3) + \ + Client.getN(1) + HS.getN(1) + +ConfigureNodes(NODES)

1 0

[tor/master] Merge remote-tracking branch 'argonblue/bug22410'
by nickm＠torproject.org 19 Jun '17

19 Jun '17

commit c2e546aa23fd0de4bb75b909a5693fdd3bcbbb8d Merge: e01e4e0 027614c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 19 15:30:23 2017 -0400 Merge remote-tracking branch 'argonblue/bug22410' changes/bug22410 | 4 ++++ configure.ac | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+)

1 0

[tor/master] Ensure that uint8_t is unsigned char
by nickm＠torproject.org 19 Jun '17

19 Jun '17

commit 027614c263b4a1ae6f74e3470723f97331af8baa Author: Taylor Yu <catalyst(a)torproject.org> Date: Fri May 26 17:04:52 2017 -0400 Ensure that uint8_t is unsigned char Many places in our code assume that uint8_t is the same type as unsigned char. Test this assumption in the configure script. This is important because of the privileged aliasing properties of character types in C. Fixes #22410. --- changes/bug22410 | 4 ++++ configure.ac | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/changes/bug22410 b/changes/bug22410 new file mode 100644 index 0000000..678a26d --- /dev/null +++ b/changes/bug22410 @@ -0,0 +1,4 @@ + o Minor bugfixes (portability): + - Check at configure time whether uint8_t is unsigned char. Lots + of existing code already assumes this, and there could be strict + aliasing issues if they aren't the same type. Fixes #22410. diff --git a/configure.ac b/configure.ac index 0c673d0..e8b35e8 100644 --- a/configure.ac +++ b/configure.ac @@ -1552,6 +1552,24 @@ if test "$tor_cv_sign_extend" != "no"; then [Define to 1 iff right-shifting a negative value performs sign-extension]) fi +# Is uint8_t the same type as unsigned char? +AC_CACHE_CHECK([whether uint8_t is the same type as unsigned char], tor_cv_uint8_uchar, +[AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ +#include <stdint.h> +extern uint8_t c; +unsigned char c;]])], + [tor_cv_uint8_uchar=yes], + [tor_cv_uint8_uchar=no], + [tor_cv_uint8_uchar=cross])]) + +if test "$tor_cv_uint8_uchar" = "cross"; then + AC_MSG_NOTICE([Cross-compiling: we'll assume that uint8_t is the same type as unsigned char]) +fi + +if test "$tor_cv_uint8_uchar" = "no"; then + AC_MSG_ERROR([We assume that uint8_t is the same type as unsigned char, but your compiler disagrees.]) +fi + # Whether we should use the dmalloc memory allocation debugging library. AC_MSG_CHECKING(whether to use dmalloc (debug memory allocation library)) AC_ARG_WITH(dmalloc,

1 0

[tor-messenger-build/master] Update README.md for Docker installation
by sukhbir＠torproject.org 19 Jun '17

19 Jun '17

commit 791495c71de77688b22c5ba7f234ea6519dc83bd Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jun 19 14:17:45 2017 -0400 Update README.md for Docker installation --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 53ad767..0a6fb38 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,11 @@ The Docker package is usually named docker.io or docker-io. On Debian jessie, the docker.io package is available in backports. Your user account should have access to the docker command without using -sudo, so it should be in the docker group. The docker daemon should -also be running. +sudo, so it should be in the docker group. + + sudo usermod -aG docker $(whoami) + +The docker daemon should also be running. The sources are downloaded using git and mercurial which need to be installed.

1 0

[tor/master] refer to the correct version
by nickm＠torproject.org 19 Jun '17

19 Jun '17

commit 0379439fe89f7951415659b5fe2136e2a7fdc6ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 19 14:15:04 2017 -0400 refer to the correct version --- src/or/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 5fda820..218fd4e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -693,12 +693,12 @@ static const config_deprecation_t option_deprecation_notes_[] = { "NoAdvertise sub-option" }, /* End of options deprecated since 0.2.9.2-alpha. */ - /* Deprecated since 0.3.1.0-alpha. */ + /* Deprecated since 0.3.2.0-alpha. */ { "HTTPProxy", "It only applies to direct unencrypted HTTP connections " "to your directory server, which your Tor probably wasn't using." }, { "HTTPProxyAuthenticator", "HTTPProxy is deprecated in favor of HTTPSProxy " "which should be used with HTTPSProxyAuthenticator." }, - /* End of options deprecated since 0.3.1.0-alpha. */ + /* End of options deprecated since 0.3.2.0-alpha. */ { NULL, NULL } };

1 0

[tor/master] Merge branch 'ticket20575_031_01_squashed'
by nickm＠torproject.org 19 Jun '17

19 Jun '17

commit e01e4e0146a4618678b5ec8003e0f8a798b592e7 Merge: bf95d67 0379439 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 19 14:16:21 2017 -0400 Merge branch 'ticket20575_031_01_squashed' changes/ticket20575 | 4 ++++ doc/tor.1.txt | 5 +++-- src/or/config.c | 7 +++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --cc src/or/config.c index 7d2ebbd,218fd4e..3413442 --- a/src/or/config.c +++ b/src/or/config.c @@@ -669,10 -662,44 +669,17 @@@ static const config_deprecation_t optio /* Deprecated since 0.2.9.2-alpha... */ { "AllowDotExit", "Unrestricted use of the .exit notation can be used for " "a wide variety of application-level attacks." }, - { "AllowInvalidNodes", "There is no reason to enable this option; at best " - "it will make you easier to track." }, - { "AllowSingleHopCircuits", "Almost no relays actually allow single-hop " - "exits, making this option pointless." }, - { "AllowSingleHopExits", "Turning this on will make your relay easier " - "to abuse." }, { "ClientDNSRejectInternalAddresses", "Turning this on makes your client " "easier to fingerprint, and may open you to esoteric attacks." }, - { "ExcludeSingleHopRelays", "Turning it on makes your client easier to " - "fingerprint." }, - { "FastFirstHopPK", "Changing this option does not make your client more " - "secure, but does make it easier to fingerprint." }, - { "CloseHSClientCircuitsImmediatelyOnTimeout", "This option makes your " - "client easier to fingerprint." }, - { "CloseHSServiceRendCircuitsImmediatelyOnTimeout", "This option makes " - "your hidden services easier to fingerprint." }, - { "WarnUnsafeSocks", "Changing this option makes it easier for you " - "to accidentally lose your anonymity by leaking DNS information" }, - { "TLSECGroup", "The default is a nice secure choice; the other option " - "is less secure." }, - { "ControlListenAddress", "Use ControlPort instead." }, - { "DirListenAddress", "Use DirPort instead, possibly with the " - "NoAdvertise sub-option" }, - { "DNSListenAddress", "Use DNSPort instead." }, - { "SocksListenAddress", "Use SocksPort instead." }, - { "TransListenAddress", "Use TransPort instead." }, - { "NATDListenAddress", "Use NATDPort instead." }, - { "ORListenAddress", "Use ORPort instead, possibly with the " - "NoAdvertise sub-option" }, /* End of options deprecated since 0.2.9.2-alpha. */ + /* Deprecated since 0.3.2.0-alpha. */ + { "HTTPProxy", "It only applies to direct unencrypted HTTP connections " + "to your directory server, which your Tor probably wasn't using." }, + { "HTTPProxyAuthenticator", "HTTPProxy is deprecated in favor of HTTPSProxy " + "which should be used with HTTPSProxyAuthenticator." }, + /* End of options deprecated since 0.3.2.0-alpha. */ + { NULL, NULL } };

1 0