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

[tor/master] It appears I added an empty file by mistake.
by nickm＠torproject.org 27 Feb '16

27 Feb '16

commit f4864d37eca797f9f62b34c8b9c442c25825e3e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 27 18:25:51 2016 +0100 It appears I added an empty file by mistake. --- src/common/timing.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/common/timing.c b/src/common/timing.c deleted file mode 100644 index e69de29..0000000

1 0

[tor/master] Make sure that every module in src/or has a brief description.
by nickm＠torproject.org 27 Feb '16

27 Feb '16

commit fe6ca826dfc4d107faead4d3293740f29ad88ac1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 27 18:08:24 2016 +0100 Make sure that every module in src/or has a brief description. --- src/or/addressmap.c | 9 +++++++++ src/or/buffers.c | 3 ++- src/or/channel.c | 6 +++++- src/or/channeltls.c | 4 +++- src/or/circpathbias.c | 9 +++++++++ src/or/circuitbuild.c | 4 +++- src/or/circuitlist.c | 3 ++- src/or/circuitstats.c | 7 +++++++ src/or/confparse.c | 7 +++++++ src/or/dnsserv.c | 3 ++- src/or/fp_pair.c | 8 ++++++++ src/or/keypin.c | 7 +++++++ src/or/microdesc.c | 7 +++++++ src/or/nodelist.c | 8 ++++++++ src/or/ntmain.c | 6 ++++++ src/or/onion_ntor.c | 6 ++++++ src/or/periodic.c | 6 ++++++ src/or/routerkeys.c | 8 ++++++++ src/or/routerset.c | 7 +++++++ src/or/statefile.c | 7 +++++++ src/or/torcert.c | 7 +++++++ 21 files changed, 126 insertions(+), 6 deletions(-) diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 9c29fb2..26b062f 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -4,6 +4,15 @@ * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file addressmap.c + * + * \brief The addressmap module manages the processes by which we rewrite + * addresses in client requess. It handles the MapAddress controller and + * torrc commands, and the TrackHostExits feature, and the client-side DNS + * cache (deprecated). + */ + #define ADDRESSMAP_PRIVATE #include "or.h" diff --git a/src/or/buffers.c b/src/or/buffers.c index cdb499b..9bd0cba 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -8,7 +8,8 @@ * \file buffers.c * \brief Implements a generic interface buffer. Buffers are * fairly opaque string holders that can read to or flush from: - * memory, file descriptors, or TLS connections. + * memory, file descriptors, or TLS connections. Buffers are implemented + * as linked lists of memory chunks. **/ #define BUFFERS_PRIVATE #include "or.h" diff --git a/src/or/channel.c b/src/or/channel.c index 46e8338..45ff501 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -3,7 +3,11 @@ /** * \file channel.c - * \brief OR-to-OR channel abstraction layer + * + * \brief OR/OP-to-OR channel abstraction layer. A channel's job is to + * transfer cells from Tor instance to Tor instance. + * Currently, there is only one implementation of the channel abstraction: in + * channeltls.c. **/ /* diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 016ef75..67e6d40 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -3,7 +3,9 @@ /** * \file channeltls.c - * \brief channel_t concrete subclass using or_connection_t + * + * \brief A concrete subclass of channel_t using or_connection_t to transfer + * cells between Tor instances. **/ /* diff --git a/src/or/circpathbias.c b/src/or/circpathbias.c index a0115cc..5c8849f 100644 --- a/src/or/circpathbias.c +++ b/src/or/circpathbias.c @@ -4,6 +4,15 @@ * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file circpathbias.c + * + * \brief Code to track success/failure rates of circuits built through + * different tor nodes, in an attempt to detect attacks where + * an attacker deliberately causes circuits to fail until the client + * choses a path they like. + */ + #include "or.h" #include "channel.h" #include "circpathbias.h" diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index daf0b2a..69c34b5 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -6,7 +6,9 @@ /** * \file circuitbuild.c - * \brief The actual details of building circuits. + * + * \brief Implements the details of building circuits (by chosing paths, + * constructing/sending create/extend cells, and so on). **/ #define CIRCUITBUILD_PRIVATE diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index ade371d..61d2bb8 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -6,7 +6,8 @@ /** * \file circuitlist.c - * \brief Manage the global circuit list. + * + * \brief Manage the global circuit list, and looking up circuits within it. **/ #define CIRCUITLIST_PRIVATE #include "or.h" diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index 3ced5af..7449244 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -4,6 +4,13 @@ * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file circuitstats.c + * + * \brief Maintains and analyzes statistics about circuit built times, so we + * can tell how long we may need to wait for a fast circuit to be constructed. + */ + #define CIRCUITSTATS_PRIVATE #include "or.h" diff --git a/src/or/confparse.c b/src/or/confparse.c index ac21df2..26909c8 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -4,6 +4,13 @@ * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file confparse.c + * + * \brief Back-end for parsing and generating key-value files, used to + * implement the torrc file format and the state file. + */ + #include "or.h" #include "confparse.h" #include "routerset.h" diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index ded0d84..941b9e2 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -2,7 +2,8 @@ /* See LICENSE for licensing information */ /** - * \file dnsserv.c \brief Implements client-side DNS proxy server code. Note: + * \file dnsserv.c + * \brief Implements client-side DNS proxy server code. Note: * this is the DNS Server code, not the Server DNS code. Confused? This code * runs on client-side, and acts as a DNS server. The code in dns.c, on the * other hand, runs on Tor servers, and acts as a DNS client. diff --git a/src/or/fp_pair.c b/src/or/fp_pair.c index c863d41..a1924fe 100644 --- a/src/or/fp_pair.c +++ b/src/or/fp_pair.c @@ -1,6 +1,14 @@ /* Copyright (c) 2013-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file fp_pair.c + * + * \brief Manages data structures for associating pairs of fingerprints. Used + * to handle combinations of identity/signing-key fingerprints for + * authorities. + **/ + #include "or.h" #include "fp_pair.h" diff --git a/src/or/keypin.c b/src/or/keypin.c index 574a76d..6c294c7 100644 --- a/src/or/keypin.c +++ b/src/or/keypin.c @@ -1,6 +1,13 @@ /* Copyright (c) 2014, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file keypin.c + * + * \brief Functions and structures for associating routers' RSA key + * fingerprints with their ED25519 keys. + */ + #define KEYPIN_PRIVATE #include "orconfig.h" diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 900a50e..520cade 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -1,6 +1,13 @@ /* Copyright (c) 2009-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file microdesc.c + * + * \brief Implements microdescriptors -- an abbreviated description of + * less-frequently-changing router information. + */ + #include "or.h" #include "circuitbuild.h" #include "config.h" diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 91353ee..2fbcabb 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -4,6 +4,14 @@ * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file nodelist.c + * + * \brief Structures and functions for tracking what we know about the routers + * on the Tor network, and correlating information from networkstatus, + * routerinfo, and microdescs. + */ + #include "or.h" #include "address.h" #include "config.h" diff --git a/src/or/ntmain.c b/src/or/ntmain.c index b31ed86..89739ad 100644 --- a/src/or/ntmain.c +++ b/src/or/ntmain.c @@ -3,6 +3,12 @@ * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file ntmain.c + * + * \brief Entry points for running/configuring Tor as Windows Service. + */ + #ifdef _WIN32 #include "or.h" diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c index 539f06f..c394096 100644 --- a/src/or/onion_ntor.c +++ b/src/or/onion_ntor.c @@ -1,6 +1,12 @@ /* Copyright (c) 2012-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file onion_ntor.c + * + * \brief Implementation for the ntor handshake. + */ + #include "orconfig.h" #define ONION_NTOR_PRIVATE diff --git a/src/or/periodic.c b/src/or/periodic.c index 109717f..2f819e9 100644 --- a/src/or/periodic.c +++ b/src/or/periodic.c @@ -1,6 +1,12 @@ /* Copyright (c) 2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file periodic.c + * + * \brief Generic backend for handling periodic events. + */ + #include "or.h" #include "compat_libevent.h" #include "config.h" diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 210178d..9d3a9c3 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -1,6 +1,14 @@ /* Copyright (c) 2014, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file routerkeys.c + * + * \brief Functions and structures to handle generating and maintaining the + * set of keypairs necessary to be an OR. (Some of the code in router.c + * belongs here.) + */ + #include "or.h" #include "config.h" #include "router.h" diff --git a/src/or/routerset.c b/src/or/routerset.c index debe9ec..073e762 100644 --- a/src/or/routerset.c +++ b/src/or/routerset.c @@ -4,6 +4,13 @@ * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file routerset.c + * + * \brief Functions and structures to handle set-type selection of routers + * by name, ID, address, etc. + */ + #define ROUTERSET_PRIVATE #include "or.h" diff --git a/src/or/statefile.c b/src/or/statefile.c index 7fe8dc5..12cef12 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -4,6 +4,13 @@ * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file statefile.c + * + * \brief Handles parsing and encoding the persistent 'state' file that carries + * miscellaneous persistent state between Tor invocations. + */ + #define STATEFILE_PRIVATE #include "or.h" #include "circuitstats.h" diff --git a/src/or/torcert.c b/src/or/torcert.c index ef5b4c0..9c02f9c 100644 --- a/src/or/torcert.c +++ b/src/or/torcert.c @@ -1,6 +1,13 @@ /* Copyright (c) 2014, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file torcert.c + * + * \brief Implementation for ed25519-signed certificates as used in the Tor + * protocol. + */ + #include "crypto.h" #include "torcert.h" #include "ed25519_cert.h"

1 0

[tor/master] Add a brief file-level description for everything in src/common
by nickm＠torproject.org 27 Feb '16

27 Feb '16

commit 23f8c9b32fc8515b7666b10167b9a1104a20de3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 27 18:19:57 2016 +0100 Add a brief file-level description for everything in src/common --- src/common/backtrace.c | 7 +++++++ src/common/compat_pthreads.c | 7 +++++++ src/common/compat_threads.c | 8 ++++++++ src/common/compat_winthreads.c | 7 +++++++ src/common/crypto_curve25519.c | 6 +++++- src/common/crypto_ed25519.c | 6 +++++- src/common/crypto_format.c | 6 +++++- src/common/crypto_pwbox.c | 9 +++++++++ src/common/crypto_s2k.c | 6 ++++++ src/common/util_format.c | 7 +++++++ src/common/workqueue.c | 7 +++++++ 11 files changed, 73 insertions(+), 3 deletions(-) diff --git a/src/common/backtrace.c b/src/common/backtrace.c index 94de1eb..f7b5dc2 100644 --- a/src/common/backtrace.c +++ b/src/common/backtrace.c @@ -1,6 +1,13 @@ /* Copyright (c) 2013-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file backtrace.c + * + * \brief Functions to produce backtraces on bugs, crashes, or assertion + * failures. + */ + #define __USE_GNU #define _GNU_SOURCE 1 diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c index b1d87d3..b59f097 100644 --- a/src/common/compat_pthreads.c +++ b/src/common/compat_pthreads.c @@ -3,6 +3,13 @@ * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file compat_pthreads.c + * + * \brief Implementation for the pthreads-based multithreading backend + * functions. + */ + #define _GNU_SOURCE #include "orconfig.h" diff --git a/src/common/compat_threads.c b/src/common/compat_threads.c index 85ad737..848b10a 100644 --- a/src/common/compat_threads.c +++ b/src/common/compat_threads.c @@ -3,6 +3,14 @@ * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file compat_threads.c + * + * \brief Cross-platform threading and inter-thread communication logic. + * (Platform-specific parts are written in the other compat_*threads + * modules.) + */ + #define _GNU_SOURCE #include "orconfig.h" diff --git a/src/common/compat_winthreads.c b/src/common/compat_winthreads.c index 9a87daa..ba0b641 100644 --- a/src/common/compat_winthreads.c +++ b/src/common/compat_winthreads.c @@ -3,6 +3,13 @@ * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file compat_winthreads.c + * + * \brief Implementation for the windows-based multithreading backend + * functions. + */ + #ifdef _WIN32 #include "compat.h" diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c index 2002483..47a93bf 100644 --- a/src/common/crypto_curve25519.c +++ b/src/common/crypto_curve25519.c @@ -1,7 +1,11 @@ /* Copyright (c) 2012-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -/* Wrapper code for a curve25519 implementation. */ +/** + * \file crypto_curve25519.c + * + * \brief Wrapper code for a curve25519 implementation. + */ #define CRYPTO_CURVE25519_PRIVATE #include "orconfig.h" diff --git a/src/common/crypto_ed25519.c b/src/common/crypto_ed25519.c index 9df665f..3409b7f 100644 --- a/src/common/crypto_ed25519.c +++ b/src/common/crypto_ed25519.c @@ -1,7 +1,11 @@ /* Copyright (c) 2013-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -/* Wrapper code for an ed25519 implementation. */ +/** + * \file crypto_ed25519.c + * + * \brief Wrapper code for an ed25519 implementation. + */ #include "orconfig.h" #ifdef HAVE_SYS_STAT_H diff --git a/src/common/crypto_format.c b/src/common/crypto_format.c index d4ecd5b..422ebb5 100644 --- a/src/common/crypto_format.c +++ b/src/common/crypto_format.c @@ -4,7 +4,11 @@ * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -/* Formatting and parsing code for crypto-related data structures. */ +/** + * \file crypto_format.c + * + * \brief Formatting and parsing code for crypto-related data structures. + */ #include "orconfig.h" #ifdef HAVE_SYS_STAT_H diff --git a/src/common/crypto_pwbox.c b/src/common/crypto_pwbox.c index b866c7e..819dc0c 100644 --- a/src/common/crypto_pwbox.c +++ b/src/common/crypto_pwbox.c @@ -1,3 +1,12 @@ +/* Copyright (c) 2014-2016, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file crypto_pwbox.c + * + * \brief Code for encrypting secrets in a password-protected form and saving + * them to disk. + */ #include "crypto.h" #include "crypto_s2k.h" diff --git a/src/common/crypto_s2k.c b/src/common/crypto_s2k.c index 99f3b2e..6dd791e 100644 --- a/src/common/crypto_s2k.c +++ b/src/common/crypto_s2k.c @@ -4,6 +4,12 @@ * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file crypto_s2k.c + * + * \brief Functions for deriving keys from human-readable passphrases. + */ + #define CRYPTO_S2K_PRIVATE #include "crypto.h" diff --git a/src/common/util_format.c b/src/common/util_format.c index 8d99138..476e098 100644 --- a/src/common/util_format.c +++ b/src/common/util_format.c @@ -4,6 +4,13 @@ * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file util_format.c + * + * \brief Miscellaneous functions for encoding and decoding various things + * in base{16,32,64}. + */ + #include "orconfig.h" #include "torlog.h" #include "util.h" diff --git a/src/common/workqueue.c b/src/common/workqueue.c index c467bdf..0a38550 100644 --- a/src/common/workqueue.c +++ b/src/common/workqueue.c @@ -1,6 +1,13 @@ /* copyright (c) 2013-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file workqueue.c + * + * \brief Implements worker threads, queues of work for them, and mechanisms + * for them to send answers back to the main thread. + */ + #include "orconfig.h" #include "compat.h" #include "compat_threads.h"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 27 Feb '16

27 Feb '16

commit ca0644e7f479975cf4bb9c37141caaea739ad80c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 27 17:22:14 2016 +0000 Update translations for tails-misc_completed --- zh_TW.po | 82 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index 38b06a1..69112ea 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-12 13:52+0100\n" -"PO-Revision-Date: 2016-02-24 22:22+0000\n" +"POT-Creation-Date: 2016-02-24 21:38+0100\n" +"PO-Revision-Date: 2016-02-27 16:56+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -52,30 +52,30 @@ msgid "" "\n" msgstr "<h1>幫助我們修復您的程式錯誤！</h1>\n閱讀<a href=\"%s\">我們的錯誤回報資訊</a>.\n請不要含有任何不必要的個人資訊！\n<h2>關於給我們您的電子郵件位址</h2>\n\n給我們一個電子郵件位址能讓我們聯絡您來釐清問題。這是必須的也是我們收到大多數錯誤報告的方式。然而，這也是讓監聽者像是您的電子郵件或網路供應商機會以確認您正在使用 Tails。\n\n" -#: config/chroot_local-includes/usr/local/bin/electrum:14 +#: config/chroot_local-includes/usr/local/bin/electrum:17 msgid "Persistence is disabled for Electrum" msgstr "永久停用 Electrum" -#: config/chroot_local-includes/usr/local/bin/electrum:16 +#: config/chroot_local-includes/usr/local/bin/electrum:19 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." msgstr "當您重開 Tails 時，所有 Electrum 資料會消失，包括您的比特幣錢包。強烈建議只在當永久功能啟用時才使用 Electrum。" -#: config/chroot_local-includes/usr/local/bin/electrum:18 +#: config/chroot_local-includes/usr/local/bin/electrum:21 msgid "Do you want to start Electrum anyway?" msgstr "您想要啟用 Electrum 嗎？" -#: config/chroot_local-includes/usr/local/bin/electrum:20 -#: config/chroot_local-includes/usr/local/bin/icedove:22 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 +#: config/chroot_local-includes/usr/local/bin/electrum:23 +#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_啟動器" -#: config/chroot_local-includes/usr/local/bin/electrum:21 -#: config/chroot_local-includes/usr/local/bin/icedove:23 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 +#: config/chroot_local-includes/usr/local/bin/electrum:24 +#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_離開" @@ -233,11 +233,11 @@ msgstr "GnuPG 的輸出:" msgid "Other messages provided by GnuPG:" msgstr "由 GnuPG 提供的其他郵件:" -#: config/chroot_local-includes/usr/local/bin/icedove:18 +#: config/chroot_local-includes/usr/local/bin/icedove:19 msgid "The Claws Mail persistence feature is activated." msgstr "Claws Mail 的永久保存功能已經啟用。" -#: config/chroot_local-includes/usr/local/bin/icedove:20 +#: config/chroot_local-includes/usr/local/bin/icedove:21 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" @@ -318,40 +318,40 @@ msgstr "此 Tails 版本有已知的安全性問題:" msgid "Known security issues" msgstr "已知的安全性問題" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 #, sh-format msgid "Network card ${nic} disabled" msgstr "網路卡 ${nic} 被停用" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." msgstr "網路卡 ${nic_name} (${nic}) 進行MAC詐騙失敗，故它暫時被停用。\n您可能要將 Tails 重新啟動並停用 MAC 詐騙。" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 msgid "All networking disabled" msgstr "所有網路被停用" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." msgstr "網路卡 ${nic_name} (${nic}) 進行MAC詐騙失敗。\n而在進行還原時也失敗，故它暫時被停用。\n您可能要將 Tails 重新啟動並停用 MAC 詐騙。" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:18 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 msgid "error:" msgstr "錯誤:" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:23 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:25 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 msgid "Error" msgstr "錯誤" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:39 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:45 msgid "" "Not enough memory available to check for upgrades.\n" "\n" @@ -390,52 +390,52 @@ msgstr "主機作業系統和虛擬化軟體都能夠監控您在 Tails 中做 msgid "Learn more" msgstr "繼續閱讀" -#: config/chroot_local-includes/usr/local/bin/tor-browser:41 +#: config/chroot_local-includes/usr/local/bin/tor-browser:40 msgid "Tor is not ready" msgstr "Tor 未就緒" -#: config/chroot_local-includes/usr/local/bin/tor-browser:42 +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor 未就緒。無論如何啟動 Tor 瀏覽器嗎?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:43 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Start Tor Browser" msgstr "啟動 Tor 瀏覽器" -#: config/chroot_local-includes/usr/local/bin/tor-browser:44 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Cancel" msgstr "取消" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:33 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" msgstr "您真的要啟動不安全的瀏覽器嗎?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" "Network activity within the Unsafe Browser is not anonymous.\\nOnly " "use the Unsafe Browser if necessary, for example\\nif you have to login or " "register to activate your Internet connection." msgstr "在不安全的瀏覽器中的網路活動是無法匿名。\\n如有必要，請僅使用不安全的瀏覽器在一些您必須登入或註冊來啟動您的網際網路連線。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 msgid "Starting the Unsafe Browser..." msgstr "正在啟動不安全的瀏覽器..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 msgid "This may take a while, so please be patient." msgstr "這可能需要一段時間，所以請耐心等候。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "Shutting down the Unsafe Browser..." msgstr "正在關閉不安全的瀏覽器..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:59 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "這可能需要一段時間，您可能無法將不安全的瀏覽器重新啟動，直到它正確地關閉。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:66 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 msgid "Failed to restart Tor." msgstr "無法重新啟動 Tor。" @@ -474,40 +474,40 @@ msgstr "無法設定瀏覽器" msgid "Failed to run browser." msgstr "無法開啟瀏覽器" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:34 msgid "I2P failed to start" msgstr "I2P 無法啟動" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:36 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." msgstr "I2P 啟動時發生錯誤。更多資訊請查看位於 /var/log/i2p 的紀錄檔。" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:52 msgid "I2P's router console is ready" msgstr "I2P 的路由控制台已就緒" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:54 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 msgid "You can now access I2P's router console in the I2P Browser." msgstr "你現在可以使用 I2P 瀏覽器去進入 I2P 的路由控制台。" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:58 msgid "I2P is not ready" msgstr "I2P 尚未就緒" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." msgstr "Eepsite 通道在六分鐘內沒有建立。可由 I2P 瀏覽器路由控制台或者位於 /var/log/i2p 的紀錄檔獲得更多資訊。請嘗試重新連線。" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:71 msgid "I2P is ready" msgstr "I2P 已就緒" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:73 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 msgid "You can now access services on I2P." msgstr "您現在可以存取I2P服務。"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 27 Feb '16

27 Feb '16

commit 71019f7608b888990a9f257d19c01ab0a9a16c2b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 27 17:20:03 2016 +0000 Update translations for tails-misc --- zh_TW.po | 82 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index 38b06a1..69112ea 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-12 13:52+0100\n" -"PO-Revision-Date: 2016-02-24 22:22+0000\n" +"POT-Creation-Date: 2016-02-24 21:38+0100\n" +"PO-Revision-Date: 2016-02-27 16:56+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -52,30 +52,30 @@ msgid "" "\n" msgstr "<h1>幫助我們修復您的程式錯誤！</h1>\n閱讀<a href=\"%s\">我們的錯誤回報資訊</a>.\n請不要含有任何不必要的個人資訊！\n<h2>關於給我們您的電子郵件位址</h2>\n\n給我們一個電子郵件位址能讓我們聯絡您來釐清問題。這是必須的也是我們收到大多數錯誤報告的方式。然而，這也是讓監聽者像是您的電子郵件或網路供應商機會以確認您正在使用 Tails。\n\n" -#: config/chroot_local-includes/usr/local/bin/electrum:14 +#: config/chroot_local-includes/usr/local/bin/electrum:17 msgid "Persistence is disabled for Electrum" msgstr "永久停用 Electrum" -#: config/chroot_local-includes/usr/local/bin/electrum:16 +#: config/chroot_local-includes/usr/local/bin/electrum:19 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." msgstr "當您重開 Tails 時，所有 Electrum 資料會消失，包括您的比特幣錢包。強烈建議只在當永久功能啟用時才使用 Electrum。" -#: config/chroot_local-includes/usr/local/bin/electrum:18 +#: config/chroot_local-includes/usr/local/bin/electrum:21 msgid "Do you want to start Electrum anyway?" msgstr "您想要啟用 Electrum 嗎？" -#: config/chroot_local-includes/usr/local/bin/electrum:20 -#: config/chroot_local-includes/usr/local/bin/icedove:22 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 +#: config/chroot_local-includes/usr/local/bin/electrum:23 +#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_啟動器" -#: config/chroot_local-includes/usr/local/bin/electrum:21 -#: config/chroot_local-includes/usr/local/bin/icedove:23 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 +#: config/chroot_local-includes/usr/local/bin/electrum:24 +#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_離開" @@ -233,11 +233,11 @@ msgstr "GnuPG 的輸出:" msgid "Other messages provided by GnuPG:" msgstr "由 GnuPG 提供的其他郵件:" -#: config/chroot_local-includes/usr/local/bin/icedove:18 +#: config/chroot_local-includes/usr/local/bin/icedove:19 msgid "The Claws Mail persistence feature is activated." msgstr "Claws Mail 的永久保存功能已經啟用。" -#: config/chroot_local-includes/usr/local/bin/icedove:20 +#: config/chroot_local-includes/usr/local/bin/icedove:21 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" @@ -318,40 +318,40 @@ msgstr "此 Tails 版本有已知的安全性問題:" msgid "Known security issues" msgstr "已知的安全性問題" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 #, sh-format msgid "Network card ${nic} disabled" msgstr "網路卡 ${nic} 被停用" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." msgstr "網路卡 ${nic_name} (${nic}) 進行MAC詐騙失敗，故它暫時被停用。\n您可能要將 Tails 重新啟動並停用 MAC 詐騙。" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 msgid "All networking disabled" msgstr "所有網路被停用" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." msgstr "網路卡 ${nic_name} (${nic}) 進行MAC詐騙失敗。\n而在進行還原時也失敗，故它暫時被停用。\n您可能要將 Tails 重新啟動並停用 MAC 詐騙。" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:18 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 msgid "error:" msgstr "錯誤:" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:23 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:25 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 msgid "Error" msgstr "錯誤" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:39 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:45 msgid "" "Not enough memory available to check for upgrades.\n" "\n" @@ -390,52 +390,52 @@ msgstr "主機作業系統和虛擬化軟體都能夠監控您在 Tails 中做 msgid "Learn more" msgstr "繼續閱讀" -#: config/chroot_local-includes/usr/local/bin/tor-browser:41 +#: config/chroot_local-includes/usr/local/bin/tor-browser:40 msgid "Tor is not ready" msgstr "Tor 未就緒" -#: config/chroot_local-includes/usr/local/bin/tor-browser:42 +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor 未就緒。無論如何啟動 Tor 瀏覽器嗎?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:43 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Start Tor Browser" msgstr "啟動 Tor 瀏覽器" -#: config/chroot_local-includes/usr/local/bin/tor-browser:44 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Cancel" msgstr "取消" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:33 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" msgstr "您真的要啟動不安全的瀏覽器嗎?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" "Network activity within the Unsafe Browser is not anonymous.\\nOnly " "use the Unsafe Browser if necessary, for example\\nif you have to login or " "register to activate your Internet connection." msgstr "在不安全的瀏覽器中的網路活動是無法匿名。\\n如有必要，請僅使用不安全的瀏覽器在一些您必須登入或註冊來啟動您的網際網路連線。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 msgid "Starting the Unsafe Browser..." msgstr "正在啟動不安全的瀏覽器..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 msgid "This may take a while, so please be patient." msgstr "這可能需要一段時間，所以請耐心等候。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "Shutting down the Unsafe Browser..." msgstr "正在關閉不安全的瀏覽器..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:59 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "這可能需要一段時間，您可能無法將不安全的瀏覽器重新啟動，直到它正確地關閉。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:66 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 msgid "Failed to restart Tor." msgstr "無法重新啟動 Tor。" @@ -474,40 +474,40 @@ msgstr "無法設定瀏覽器" msgid "Failed to run browser." msgstr "無法開啟瀏覽器" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:34 msgid "I2P failed to start" msgstr "I2P 無法啟動" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:36 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." msgstr "I2P 啟動時發生錯誤。更多資訊請查看位於 /var/log/i2p 的紀錄檔。" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:52 msgid "I2P's router console is ready" msgstr "I2P 的路由控制台已就緒" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:54 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 msgid "You can now access I2P's router console in the I2P Browser." msgstr "你現在可以使用 I2P 瀏覽器去進入 I2P 的路由控制台。" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:58 msgid "I2P is not ready" msgstr "I2P 尚未就緒" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." msgstr "Eepsite 通道在六分鐘內沒有建立。可由 I2P 瀏覽器路由控制台或者位於 /var/log/i2p 的紀錄檔獲得更多資訊。請嘗試重新連線。" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:71 msgid "I2P is ready" msgstr "I2P 已就緒" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:73 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 msgid "You can now access services on I2P." msgstr "您現在可以存取I2P服務。"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 27 Feb '16

27 Feb '16

commit 27e55a08327d8b8b1be27b411fee4f68a886192d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 27 17:17:19 2016 +0000 Update translations for torcheck_completed --- zh_TW/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/torcheck.po b/zh_TW/torcheck.po index e9fb16a..a911451 100644 --- a/zh_TW/torcheck.po +++ b/zh_TW/torcheck.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-02-27 05:35+0000\n" +"PO-Revision-Date: 2016-02-27 16:56+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 27 Feb '16

27 Feb '16

commit d60bb04123fbc96d6ab3c1ec43a96949f46cd693 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 27 17:15:08 2016 +0000 Update translations for torcheck --- zh_TW/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/torcheck.po b/zh_TW/torcheck.po index e9fb16a..a911451 100644 --- a/zh_TW/torcheck.po +++ b/zh_TW/torcheck.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-02-27 05:35+0000\n" +"PO-Revision-Date: 2016-02-27 16:56+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n"

1 0

[gettor/develop] Add file for fetching latest Orfox version
by sukhbir＠torproject.org 27 Feb '16

27 Feb '16

commit ab66a2c7b58ad3415335c33d0651e7d0dd01f2c9 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Feb 27 11:01:19 2016 -0500 Add file for fetching latest Orfox version --- orfox.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/orfox.py b/orfox.py new file mode 100644 index 0000000..eb2ee4b --- /dev/null +++ b/orfox.py @@ -0,0 +1,15 @@ +import urllib2 +import xml.etree.ElementTree as ET + +URL = "https://guardianproject.info/fdroid/repo/index.xml" +PACKAGE = "https://guardianproject.info/fdroid/repo/" + +PATH = ".//application[13]/package/" + +def orfox_data(): + tree = ET.fromstring(urllib2.urlopen(URL).read()) + + package_name = PACKAGE + tree.find(PATH + "apkname").text + package_version = tree.find(PATH + "version").text.rsplit("-")[-1] + + return package_name, package_version

1 0

[tor/master] Merge branch 'bug18392'
by nickm＠torproject.org 27 Feb '16

27 Feb '16

commit 0a276947ba6a04d303f59630b744045459d94504 Merge: 3687526 7255b11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 27 10:17:51 2016 +0100 Merge branch 'bug18392' src/common/util.c | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-)

1 0

[tor/master] Fix check_private_dir() to work on Windows again.
by nickm＠torproject.org 27 Feb '16

27 Feb '16

commit 7255b1121d8cdba4427c86a63bada1c07edc45be Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 25 13:31:28 2016 -0500 Fix check_private_dir() to work on Windows again. On windows, you cannot open() a directory. So for Windows we should just take our previous stat-based approach. Closes bug 18392; bug not in any released Tor. --- src/common/util.c | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 488f1b6..5713235 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2059,15 +2059,14 @@ check_private_dir(const char *dirname, cpd_check_t check, int fd; int r; struct stat st; - //char *f; + + tor_assert(dirname); + #ifndef _WIN32 unsigned unwanted_bits = 0; const struct passwd *pw = NULL; uid_t running_uid; gid_t running_gid; -#else - (void)effective_user; -#endif /* * Goal is to harden the implementation by removing any @@ -2078,7 +2077,6 @@ check_private_dir(const char *dirname, cpd_check_t check, * Several suggestions taken from: * https://developer.apple.com/library/mac/documentation/Security/Conceptual/S… */ - tor_assert(dirname); /* Open directory. * O_NOFOLLOW to ensure that it does not follow symbolic links */ @@ -2099,15 +2097,11 @@ check_private_dir(const char *dirname, cpd_check_t check, /* Should we create the directory? */ if (check & CPD_CREATE) { log_info(LD_GENERAL, "Creating directory %s", dirname); -#if defined (_WIN32) - r = mkdir(dirname); -#else if (check & CPD_GROUP_READ) { r = mkdir(dirname, 0750); } else { r = mkdir(dirname, 0700); } -#endif /* check for mkdir() error */ if (r) { @@ -2153,7 +2147,6 @@ check_private_dir(const char *dirname, cpd_check_t check, return -1; } -#ifndef _WIN32 if (effective_user) { /* Look up the user and group information. * If we have a problem, bail out. */ @@ -2234,8 +2227,42 @@ check_private_dir(const char *dirname, cpd_check_t check, return 0; } } -#endif close(fd); +#else + /* Win32 case: we can't open() a directory. */ + (void)effective_user; + + char *f = tor_strdup(dirname); + clean_name_for_stat(f); + log_debug(LD_FS, "stat()ing %s", f); + r = stat(sandbox_intern_string(f), &st); + tor_free(f); + if (r) { + if (errno != ENOENT) { + log_warn(LD_FS, "Directory %s cannot be read: %s", dirname, + strerror(errno)); + return -1; + } + if (check & CPD_CREATE) { + log_info(LD_GENERAL, "Creating directory %s", dirname); + r = mkdir(dirname); + if (r) { + log_warn(LD_FS, "Error creating directory %s: %s", dirname, + strerror(errno)); + return -1; + } + } else if (!(check & CPD_CHECK)) { + log_warn(LD_FS, "Directory %s does not exist.", dirname); + return -1; + } + return 0; + } + if (!(st.st_mode & S_IFDIR)) { + log_warn(LD_FS, "%s is not a directory", dirname); + return -1; + } + +#endif return 0; }

1 0