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

[tor/master] New configuration option: DisableDebuggerAttachment
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit f79a75f59731eab85c019c41827c0c0e89d90498 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Mon May 30 17:06:51 2011 +0200 New configuration option: DisableDebuggerAttachment If set to 1, Tor will attempt to prevent basic debugging attachment attempts by other processes. (Default: 1) Supports Mac OS X and Gnu/Linux. Sebastian provided useful feedback and refactoring suggestions. Signed-off-by: Jacob Appelbaum <jacob(a)appelbaum.net> --- changes/disable_debugger_attachment | 14 ++++++++ doc/tor.1.txt | 14 ++++++++ src/or/config.c | 57 +++++++++++++++++++++++++++++++++++ src/or/or.h | 2 + 4 files changed, 87 insertions(+), 0 deletions(-) diff --git a/changes/disable_debugger_attachment b/changes/disable_debugger_attachment new file mode 100644 index 0000000..366f972 --- /dev/null +++ b/changes/disable_debugger_attachment @@ -0,0 +1,14 @@ + o Minor features: + - If set to 1, Tor will attempt to prevent basic debugging attachment + attempts by other processes. It has no impact for users who wish to + attach if they have CAP_SYS_PTRACE or if they are root. We believe that + this feature works on modern Gnu/Linux distributions, and that it may + also work on *BSD systems (untested). Some modern Gnu/Linux systems such + as Ubuntu have the kernel.yama.ptrace_scope sysctl and by default enable + it as an attempt to limit the PTRACE scope for all user processes by + default. This feature will attempt to limit the PTRACE scope for Tor + specifically - it will not attempt to alter the system wide ptrace scope + as it may not even exist. If you wish to attach to Tor with a debugger + such as gdb or strace you will want to set this to 0 for the duration of + your debugging. Normal users should leave it on. (Default: 1) + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 7d72350..c37c44c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -251,6 +251,20 @@ Other options can be specified either on the command-line (--option option requires that you start your Tor as root, and you should use the **User** option to properly reduce Tor's privileges. (Default: 0) +**DisableDebuggerAttachment** **0**|**1**:: + If set to 1, Tor will attempt to prevent basic debugging attachment attempts + by other processes. It has no impact for users who wish to attach if they + have CAP_SYS_PTRACE or if they are root. We believe that this feature + works on modern Gnu/Linux distributions, and that it may also work on *BSD + systems (untested). Some modern Gnu/Linux systems such as Ubuntu have the + kernel.yama.ptrace_scope sysctl and by default enable it as an attempt to + limit the PTRACE scope for all user processes by default. This feature will + attempt to limit the PTRACE scope for Tor specifically - it will not attempt + to alter the system wide ptrace scope as it may not even exist. If you wish + to attach to Tor with a debugger such as gdb or strace you will want to set + this to 0 for the duration of your debugging. Normal users should leave it + on. (Default: 1) + **FetchDirInfoEarly** **0**|**1**:: If set to 1, Tor will always fetch directory information like other directory caches, even if you don't meet the normal criteria for fetching diff --git a/src/or/config.c b/src/or/config.c index f3c6345..5a153b0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -40,6 +40,14 @@ #include "procmon.h" +/* Includes for the process attaching prevention */ +#if defined(HAVE_SYS_PRCTL_H) && defined(__linux__) +#include <sys/prctl.h> +#elif defined(__APPLE__) +#include <sys/types.h> +#include <sys/ptrace.h> +#endif + /** Enumeration of types which option values can take */ typedef enum config_type_t { CONFIG_TYPE_STRING = 0, /**< An arbitrary string. */ @@ -238,6 +246,7 @@ static config_var_t _option_vars[] = { V(DirReqStatistics, BOOL, "1"), VAR("DirServer", LINELIST, DirServers, NULL), V(DisableAllSwap, BOOL, "0"), + V(DisableDebuggerAttachment, BOOL, "1"), V(DisableIOCP, BOOL, "1"), V(DNSPort, PORT, "0"), V(DNSListenAddress, LINELIST, NULL), @@ -649,6 +658,47 @@ get_dirportfrontpage(void) return global_dirfrontpagecontents; } +/* We only use the linux prctl for now. There is no Win32 support; this may + * also work on various BSD systems and Mac OS X - send testing feedback! + * + * On recent Gnu/Linux kernels it is possible to create a system-wide policy + * that will prevent non-root processes from attaching to other processes + * unless they are the parent process; thus gdb can attach to programs that + * they execute but they cannot attach to other processes running as the same + * user. The system wide policy may be set with the sysctl + * kernel.yama.ptrace_scope or by inspecting /proc/sys/kernel/yama/ptrace_scope + * and it is 1 by default on Ubuntu 11.04. + * + * This ptrace scope will be ignored on Gnu/Linux for users with + * CAP_SYS_PTRACE and so it is very likely that root will still be able to + * attach to the Tor process. +*/ +/** Attempt to disable debugger attachment. */ +static int tor_disable_debugger_attach(void) { + int r; + r = -1; + log_debug(LD_CONFIG, + "Attemping to disable debugger attachment to Tor for unprivileged users."); +#if defined(__linux__) && defined(HAVE_SYS_PRCTL_H) && defined(HAVE_PRCTL) +#ifdef PR_SET_DUMPABLE + r = prctl(PR_SET_DUMPABLE, 0); +#endif +#endif +#if defined(__APPLE__) && defined(PT_DENY_ATTACH) + r = ptrace(PT_DENY_ATTACH, 0, 0, 0); +#endif + +// XXX: TODO - Mac OS X has dtrace and this may be disabled - implement it here +// XXX: TODO - Windows probably has something similar - implement it here + if (r == 0) { + log_debug(LD_CONFIG,"Debugger attachment disabled for unprivileged users."); + } else { + log_warn(LD_CONFIG, "Unable to disable ptrace attach: %s", + strerror(errno)); + } + return r; +} + /** Allocate an empty configuration object of a given format type. */ static void * config_alloc(config_format_t *fmt) @@ -1195,6 +1245,13 @@ options_act(or_options_t *old_options) int running_tor = options->command == CMD_RUN_TOR; char *msg; + /* disable ptrace and later, other basic debugging techniques */ + if (options->DisableDebuggerAttachment) { + tor_disable_debugger_attach(); + } else { + log_notice(LD_CONFIG,"Debugger attachment enabled for unprivileged users."); + } + if (running_tor && !have_lockfile()) { if (try_locking(options, 1) < 0) return -1; diff --git a/src/or/or.h b/src/or/or.h index 4b20b57..db3b171 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2900,6 +2900,8 @@ typedef struct { disclaimer. This allows a server administrator to show that they're running Tor and anyone visiting their server will know this without any specialized knowledge. */ + int DisableDebuggerAttachment; /**< Currently Linux only specific attempt to + disable ptrace; needs BSD testing. */ /** Boolean: if set, we start even if our resolv.conf file is missing * or broken. */ int ServerDNSAllowBrokenConfig;

1 0

[tor/master] Merge remote-tracking branch 'public/feature4516'
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit f634228a073965195c4088b66c1d5c4799c6eed2 Merge: 11221d0 6e6a661 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 24 22:59:37 2011 -0500 Merge remote-tracking branch 'public/feature4516' changes/UserspaceIOCPBuffers | 7 +++++++ src/or/config.c | 1 + src/or/main.c | 28 ++++++++++++++++++++++++++++ src/or/or.h | 5 +++++ 4 files changed, 41 insertions(+), 0 deletions(-)

1 0

[tor/master] New UserspaceIOCPBuffers option to set SO_{SND, RCV}BUF to zero
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit 6e6a6612966d7ea9ad3d89bb5073ef400539b2a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 18 17:43:03 2011 -0500 New UserspaceIOCPBuffers option to set SO_{SND,RCV}BUF to zero When running with IOCP, we are in theory able to use userspace- allocated buffers to avoid filling up the stingy amount of kernel space allocated for sockets buffers. The bufferevent_async implementation in Libevent provides this ability, in theory. (There are likely to be remaining bugs). This patch adds a new option that, when using IOCP bufferevents, sets each socket's send and receive buffers to 0, so that we should use this ability. When all the bugs are worked out here, if we are right about bug 98, this might solve or mitigate bug 98. This option is experimental and will likely require lots of testing and debugging. --- changes/UserspaceIOCPBuffers | 7 +++++++ src/or/config.c | 1 + src/or/main.c | 28 ++++++++++++++++++++++++++++ src/or/or.h | 5 +++++ 4 files changed, 41 insertions(+), 0 deletions(-) diff --git a/changes/UserspaceIOCPBuffers b/changes/UserspaceIOCPBuffers new file mode 100644 index 0000000..7115b5f --- /dev/null +++ b/changes/UserspaceIOCPBuffers @@ -0,0 +1,7 @@ + o Minor features: + - Experimental support for running on Windows with IOCP and no + kernel-space socket buffers. This feature is controlled by a new + UserspaceIOCPBuffers feature (off by default), which has no + effect unless Tor has been built with support for bufferevents, + is running on Windows, and has enabled IOCP. This may, in the + long run, help solve or mitigate bug 98. diff --git a/src/or/config.c b/src/or/config.c index 1b9f9fb..4710b55 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -403,6 +403,7 @@ static config_var_t _option_vars[] = { V(UseEntryGuards, BOOL, "1"), V(UseMicrodescriptors, AUTOBOOL, "auto"), V(User, STRING, NULL), + V(UserspaceIOCPBuffers, BOOL, "0"), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"), VAR("V2AuthoritativeDirectory",BOOL, V2AuthoritativeDir, "0"), VAR("V3AuthoritativeDirectory",BOOL, V3AuthoritativeDir, "0"), diff --git a/src/or/main.c b/src/or/main.c index c1a7015..9f6d307 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -196,6 +196,26 @@ free_old_inbuf(connection_t *conn) } #endif +#ifdef MS_WINDOWS +/** Remove the kernel-space send and receive buffers for <b>s</b>. For use + * with IOCP only. */ +static int +set_buffer_lengths_to_zero(tor_socket_t s) +{ + int zero = 0; + int r = 0; + if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, (void*)&zero, sizeof(zero))) { + log_warn(LD_NET, "Unable to clear SO_SNDBUF"); + r = -1; + } + if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, (void*)&zero, sizeof(zero))) { + log_warn(LD_NET, "Unable to clear SO_RCVBUF"); + r = -1; + } + return r; +} +#endif + /** Add <b>conn</b> to the array of connections that we can poll on. The * connection's socket must be set; the connection starts out * non-reading and non-writing. @@ -216,6 +236,14 @@ connection_add_impl(connection_t *conn, int is_connecting) #ifdef USE_BUFFEREVENTS if (connection_type_uses_bufferevent(conn)) { if (SOCKET_OK(conn->s) && !conn->linked) { + +#ifdef MS_WINDOWS + if (tor_libevent_using_iocp_bufferevents() && + get_options()->UserspaceIOCPBuffers) { + set_buffer_lengths_to_zero(conn->s); + } +#endif + conn->bufev = bufferevent_socket_new( tor_libevent_get_base(), conn->s, diff --git a/src/or/or.h b/src/or/or.h index e4f9b9b..7fb7e9c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3424,6 +3424,11 @@ typedef struct { * never use it. If -1, we do what the consensus says. */ int OptimisticData; + /** If 1, and we are using IOCP, we set the kernel socket SNDBUF and RCVBUF + * to 0 to try to save kernel memory and avoid the dread "Out of buffers" + * issue. */ + int UserspaceIOCPBuffers; + } or_options_t; /** Persistent state for an onion router, as saved to disk. */

1 0

r25236: {website} add xpdm back to the list, fix theonionrouter domain (in website/trunk: . include)
by Andrew Lewman 25 Nov '11

25 Nov '11

Author: phobos Date: 2011-11-25 03:56:54 +0000 (Fri, 25 Nov 2011) New Revision: 25236 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add xpdm back to the list, fix theonionrouter domain Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-11-24 15:45:11 UTC (rev 25235) +++ website/trunk/include/mirrors-table.wmi 2011-11-25 03:56:54 UTC (rev 25236) @@ -69,15 +69,15 @@ <tr> - <td>EE</td> + <td>IS</td> - <td>CyberSIDE</td> + <td>torproject.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -154,23 +154,6 @@ <tr> - <td>LT</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>AT</td> <td>FoDT.IT</td> @@ -341,6 +324,23 @@ <tr> + <td>US</td> + + <td>Xpdm</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproj.xpdm.us/dist/">http</a></td> + <td><a href="http://torproj.xpdm.us/">http</a></td> + <td><a href="https://torproj.xpdm.us/dist/">https</a></td> + <td><a href="https://torproj.xpdm.us/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IL</td> <td>Host4site</td> @@ -358,15 +358,15 @@ <tr> - <td>US</td> + <td>FR</td> - <td>AskApache</td> + <td>LazyTiger</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> + <td><a href="http://tor.taiga-san.net/dist/">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -375,15 +375,15 @@ <tr> - <td>FR</td> + <td>IS</td> - <td>LazyTiger</td> + <td>TheOnionRouter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist/">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -426,15 +426,15 @@ <tr> - <td>IS</td> + <td>LT</td> - <td>torproject.is</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -443,32 +443,32 @@ <tr> - <td>IS</td> + <td>EE</td> - <td>TheOnionRouter</td> + <td>CyberSIDE</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.theonionrouter.com/dist/">http</a></td> - <td><a href="http://www.theonionrouter.com/">http</a></td> - <td><a href="https://www.theonionrouter.com/dist/">https</a></td> - <td><a href="https://www.theonionrouter.com/">https</a></td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>US</td> - <td></td> + <td>AskApache</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.freie-re.de/dist/">http</a></td> - <td><a href="http://tor.freie-re.de/">http</a></td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -494,6 +494,23 @@ <tr> + <td>DE</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.freie-re.de/dist/">http</a></td> + <td><a href="http://tor.freie-re.de/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>TN</td> <td></td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-11-24 15:45:11 UTC (rev 25235) +++ website/trunk/update-mirrors.pl 2011-11-25 03:56:54 UTC (rev 25236) @@ -239,15 +239,34 @@ ipv4 => "True", ipv6 => "False", loadBalanced => "Unknown", - httpWebsiteMirror => "http://www.theonionrouter.com/", - httpsWebsiteMirror => "https://www.theonionrouter.com/", + httpWebsiteMirror => "http://theonionrouter.com/", + httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://www.theonionrouter.com/dist/", - httpsDistMirror => "https://www.theonionrouter.com/dist/", + httpDistMirror => "http://theonionrouter.com/dist/", + httpsDistMirror => "", rsyncDistMirror => "", updateDate => "Unknown", }, + mirror014 => { + adminContact => "tormaster AT xpdm DOT us", + orgName => "Xpdm", + isoCC => "US", + subRegion => "", + region => "North America", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "Unknown", + httpWebsiteMirror => "http://torproj.xpdm.us/", + httpsWebsiteMirror => "https://torproj.xpdm.us/", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://torproj.xpdm.us/dist/", + httpsDistMirror => "https://torproj.xpdm.us/dist/", + rsyncDistMirror => "", + hiddenServiceMirror => "http://h3prhz46uktgm4tt.onion/", + updateDate => "Unknown", + }, mirror016 => { adminContact => "security AT hostoffice DOT hu", orgName => "Unknown",

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 24 Nov '11

24 Nov '11

commit be62addb2d1c24a03fcf8a35f183e3d36cfac1df Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 24 21:45:03 2011 +0000 Update translations for orbot --- values-fr/strings.xml | 142 ++++++++++++++++++++++++------------------------ 1 files changed, 71 insertions(+), 71 deletions(-) diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 69e4253..75d7de7 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -111,81 +111,81 @@ <string name="pref_node_configuration">Configuration de nœud </string> <string name="pref_node_configuration_summary">Ce sont des paramètres avancés qui peuvent réduire votre anonymat</string> <string name="pref_entrance_node">Nœuds d\'entrée</string> - <string name="pref_entrance_node_summary"></string> - <string name="pref_entrance_node_dialog"></string> - <string name="pref_use_whispercore"></string> - <string name="pref_use_whispercore_summary"></string> - <string name="pref_proxy_type_title"></string> - <string name="pref_proxy_type_summary"></string> - <string name="pref_proxy_type_dialog"></string> - <string name="pref_proxy_host_title"></string> - <string name="pref_proxy_host_summary"></string> - <string name="pref_proxy_host_dialog"></string> - <string name="pref_proxy_port_title"></string> - <string name="pref_proxy_port_summary"></string> - <string name="pref_proxy_port_dialog"></string> - <string name="status"></string> - <string name="setting_up_full_transparent_proxying_"></string> - <string name="setting_up_app_based_transparent_proxying_"></string> - <string name="transparent_proxying_enabled"></string> - <string name="transproxy_enabled_for_tethering_"></string> - <string name="warning_error_starting_transparent_proxying_"></string> - <string name="transproxy_rules_cleared"></string> + <string name="pref_entrance_node_summary">Empreintes, pseudos, pays et adresses pour le premier saut</string> + <string name="pref_entrance_node_dialog">Entrez les nœuds d\'entrée</string> + <string name="pref_use_whispercore">Utilisez WhisperCore</string> + <string name="pref_use_whispercore_summary">Utilisez les API propriétaires fournis par Netfilter WhisperSystems (dispositif nécessaire avec WhisperCore installé)</string> + <string name="pref_proxy_type_title">Type de proxy</string> + <string name="pref_proxy_type_summary">Protocole à utiliser pour le serveur proxy : HTTP, HTTPS, Socks4, Socks5</string> + <string name="pref_proxy_type_dialog">Entrez le type de proxy</string> + <string name="pref_proxy_host_title">Hôte du proxy</string> + <string name="pref_proxy_host_summary">Nom d\'hîte du serveur proxy</string> + <string name="pref_proxy_host_dialog">Entrez le nom d\'hôte du proxy</string> + <string name="pref_proxy_port_title">Port du proxy</string> + <string name="pref_proxy_port_summary">Port du serveur proxy</string> + <string name="pref_proxy_port_dialog">Entrez le port du proxy</string> + <string name="status">Statut</string> + <string name="setting_up_full_transparent_proxying_">Configuration du proxy transparent global...</string> + <string name="setting_up_app_based_transparent_proxying_">Configuration du proxy transparent par application...</string> + <string name="transparent_proxying_enabled">Proxy transparent ACTIVÉ</string> + <string name="transproxy_enabled_for_tethering_">Transproxy activé pour Tethering!</string> + <string name="warning_error_starting_transparent_proxying_">ATTENTION : erreur au démarrage du proxy transparent !</string> + <string name="transproxy_rules_cleared">Règles transproxy effacées</string> <string name="couldn_t_start_tor_process_">L\'application n\'a pas pu démarrer le processus \"Tor\" : </string> <string name="privoxy_is_running_on_port_">Privoxy fonctionne sur le port : </string> - <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="setting_up_port_based_transparent_proxying_">Configuration du proxy transparent par port...</string> <string name="bridge_error">Erreur de passerelle</string> <string name="bridge_requires_ip">Avant de pouvoir utiliser les passerelles, vous devez entrer au moins l\'adresse IP d\'une passerelle</string> <string name="send_email_for_bridges">Envoyez un e-mail à bridges(a)torproject.org avec \"get bridges\" dans le corps de l\'e-mail - fonctionne si le mail est envoyé d\'une adresse Gmail</string> <string name="error">Erreur !</string> - <string name="your_reachableaddresses_settings_caused_an_exception_"></string> - <string name="your_relay_settings_caused_an_exception_"></string> - <string name="exit_nodes"></string> - <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> - <string name="enter_exit_nodes"></string> - <string name="exclude_nodes"></string> - <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> - <string name="enter_exclude_nodes"></string> - <string name="strict_nodes"></string> - <string name="use_only_these_specified_nodes"></string> - <string name="bridges"></string> - <string name="use_bridges"></string> - <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> - <string name="ip_address_and_port_of_bridges"></string> - <string name="enter_bridge_addresses"></string> - <string name="relays"></string> - <string name="relaying"></string> - <string name="enable_your_device_to_be_a_non_exit_relay"></string> - <string name="relay_port"></string> - <string name="listening_port_for_your_tor_relay"></string> - <string name="enter_or_port"></string> - <string name="relay_nickname"></string> - <string name="the_nickname_for_your_tor_relay"></string> - <string name="enter_a_custom_relay_nickname"></string> - <string name="reachable_addresses"></string> - <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> - <string name="reachable_ports"></string> - <string name="ports_reachable_behind_a_restrictive_firewall"></string> - <string name="enter_ports"></string> - <string name="enable_hidden_services"></string> - <string name="run_servers_accessible_via_the_tor_network"></string> - <string name="enter_localhost_ports_for_hidden_services"></string> - <string name="hidden_service_ports"></string> - <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> - <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> - <string name="project_home"></string> - <string name="project_urls"></string> - <string name="the_tor_license"></string> - <string name="https_torproject_org"></string> - <string name="third_party_software"></string> - <string name="tor_version"></string> - <string name="libevent_version"></string> - <string name="privoxy_version"></string> - <string name="iptables_version"></string> - <string name="hidden_service_request"></string> - <string name="found_existing_tor_process"></string> - <string name="something_bad_happened"></string> - <string name="hidden_service_on"></string> - <string name="unable_to_read_hidden_service_name"></string> - <string name="unable_to_start_tor"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_">Les paramètres pour ReachableAddresses ont provoqué une erreur !</string> + <string name="your_relay_settings_caused_an_exception_">Vos paramètres de relais ont provoqué une erreur !</string> + <string name="exit_nodes">Nœuds de sortie</string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Empreintes, pseudos, pays et adresses pour le dernier saut</string> + <string name="enter_exit_nodes">Saisissez les noeuds de sortie</string> + <string name="exclude_nodes">Exclure des nœuds</string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Empreintes, pseudos, pays et adresses à exclure</string> + <string name="enter_exclude_nodes">Entrez les nœuds à exclure</string> + <string name="strict_nodes">Nœuds stricts</string> + <string name="use_only_these_specified_nodes">Utiliser * uniquement * les nœuds spécifiés</string> + <string name="bridges">Ponts</string> + <string name="use_bridges">Utiliser des ponts</string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activer des nœuds alternatifs d\'entrée dans le réseau Tor</string> + <string name="ip_address_and_port_of_bridges">Adresse IP et port des ponts</string> + <string name="enter_bridge_addresses">Entrez les adresses de passerelle</string> + <string name="relays">Relais</string> + <string name="relaying">Relayage</string> + <string name="enable_your_device_to_be_a_non_exit_relay">Configurer votre appareil pour ne pas être un relais de sortie</string> + <string name="relay_port">Port du relais</string> + <string name="listening_port_for_your_tor_relay">Port d\'écoute pour votre relais Tor</string> + <string name="enter_or_port">Entrez le port OR</string> + <string name="relay_nickname">Pseudo du relais</string> + <string name="the_nickname_for_your_tor_relay">Le pseudo de votre relais Tor</string> + <string name="enter_a_custom_relay_nickname">Entrez un pseudo personalisé pour le relais</string> + <string name="reachable_addresses">Adresses accessibles</string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Exécuter en tant que client derrière un pare-feu avec les politiques restrictives</string> + <string name="reachable_ports">Ports accessibles</string> + <string name="ports_reachable_behind_a_restrictive_firewall">Ports accessibles derrière un pare-feu restrictif</string> + <string name="enter_ports">Entrez les ports</string> + <string name="enable_hidden_services">Activer les services cachés</string> + <string name="run_servers_accessible_via_the_tor_network">Exécuter des serveurs accessibles via le réseau Tor</string> + <string name="enter_localhost_ports_for_hidden_services">entrer dans les ports localhost pour les services cachés</string> + <string name="hidden_service_ports">Ports des services cachés</string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">le nom adressable pour votre service caché (généré automatiquement)</string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">permettre le débogage vers la console (vous devez utiliser adb ou aLogCat pour le visualiser)</string> + <string name="project_home">Page(s) d\'accueil du projet :</string> + <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="the_tor_license">La licence de Tor</string> + <string name="https_torproject_org">https://torproject.org</string> + <string name="third_party_software">Logiciels tierce-partie :</string> + <string name="tor_version">Tor v0.2.3.7-alpha: https://www.torproject.org</string> + <string name="libevent_version">Libevent v1.4.13 : http://www.monkey.org/~provos/libevent/</string> + <string name="privoxy_version">Privoxy v3.0.12 : http://www.privoxy.org</string> + <string name="iptables_version">Iptables v1.4.7 : http://www.netfilter.org</string> + <string name="hidden_service_request">Une application veut ouvrir le port %S du serveur caché sur le réseau Tor. C\'est sécuritaire si vous faites confiance à l\'application.</string> + <string name="found_existing_tor_process">trouvé un processus existant de Tor ...</string> + <string name="something_bad_happened">Quelque chose d\'incorrect s\'est passé. Vérifiez le journal</string> + <string name="hidden_service_on">service caché sur :</string> + <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string> + <string name="unable_to_start_tor">Impossible de démarrer Tor :</string> </resources>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 24 Nov '11

24 Nov '11

commit 1e5a6c9703f1af6a838c195966c452221cc509dd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 24 21:15:03 2011 +0000 Update translations for orbot --- values-fr/strings.xml | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/values-fr/strings.xml b/values-fr/strings.xml index ab8a455..69e4253 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -86,30 +86,31 @@ <string name="pref_general_group">Général</string> <string name="pref_start_boot_title">Exécuter Orbot automatiquement</string> <string name="pref_start_boot_summary">Démarrer automatiquement Orbot et se connecter à Tor quand votre périphérique Android démarre</string> - <string name="wizard_title_msg"></string> + <string name="wizard_title_msg">Orbot, c\'est Tor sur Android !\n\n Tor vous aide à vous protéger du filtrage de contenu, de l\'analyse de trafic et de la surveillance des réseaux qui menacent la vie privée, les informations confidentielles et les relations interpersonnelles.\n\nCe assistant vous aidera à configurer Orbot et Tor sur votre appareil.</string> <string name="wizard_warning_title">Attention</string> - <string name="wizard_warning_msg"></string> + <string name="wizard_warning_msg">Installer Orbot ne suffit pas à anonymiser automatiquement le trafic de votre mobile.\n\nVous devez configurer correctement Orbot, votre appareil et d\'autres applications pour utiliser adéquatement Tor.</string> <string name="wizard_permissions_title">Permissions</string> <string name="wizard_permissions_root_msg1">Vous pouvez aussi, optionnellement donner l\'accès \"Super Utilisateur\" à Orbot pour activer les options avancées, comme le Proxy Transparent</string> <string name="wizard_permissions_root_msg2">Si vous ne voulez pas faire ça, merci de vous assurer que les applications que vous utilisez ont été faites pour fonctionner avec Orbot.</string> - <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_permissions_no_root_msg">Votre appareil est en mode standard et ne supporte pas l\'accès root ou «super-utilisateur».\n\nPour bénéficier de Tor, vous avez besoin d\'utiliser des applications conçues pour fonctionner avec Orbot ou permettant de définir un proxy de type HTTP ou SOCKS.\n\n +</string> <string name="wizard_tips_title">Applications Orbot</string> - <string name="wizard_tips_gibberbot"></string> + <string name="wizard_tips_gibberbot">Gibberbot: application de clavardage sécurisé avec chiffrement Off-the-Record</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée &amp; pour Orbot</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> - <string name="wizard_transproxy_title"></string> - <string name="wizard_transproxy_msg"></string> - <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_title">Proxy transparent</string> + <string name="wizard_transproxy_msg">Cela permet à vos applications d\'utiliser automatiquement le réseau Tor sans aucune configuration.</string> + <string name="wizard_transproxy_hint">(Cochez cette case si vous n\'avez aucune idée de ce dont nous parlons)</string> <string name="wizard_transproxy_none">Rien</string> - <string name="pref_transparent_tethering_title"></string> - <string name="pref_transparent_tethering_summary"></string> - <string name="button_grant_superuser"></string> - <string name="pref_select_apps"></string> - <string name="pref_select_apps_summary"></string> - <string name="pref_node_configuration"></string> - <string name="pref_node_configuration_summary"></string> - <string name="pref_entrance_node"></string> + <string name="pref_transparent_tethering_title">Tethering Tor</string> + <string name="pref_transparent_tethering_summary">Activer le proxy transparent pour Wifi et les périphériques USB Tethered (redémarrage nécessaire)</string> + <string name="button_grant_superuser">Demande d\'accès superutilisateur</string> + <string name="pref_select_apps">Choisir les applications</string> + <string name="pref_select_apps_summary">Choisir les applications à diriger vers Tor</string> + <string name="pref_node_configuration">Configuration de nœud </string> + <string name="pref_node_configuration_summary">Ce sont des paramètres avancés qui peuvent réduire votre anonymat</string> + <string name="pref_entrance_node">Nœuds d\'entrée</string> <string name="pref_entrance_node_summary"></string> <string name="pref_entrance_node_dialog"></string> <string name="pref_use_whispercore"></string>

1 0

r25235: {website} bump packages to 0.2.3.8-alpha and update tbbs for new firef (website/trunk/include)
by Erinn Clark 24 Nov '11

24 Nov '11

Author: erinn Date: 2011-11-24 15:45:11 +0000 (Thu, 24 Nov 2011) New Revision: 25235 Modified: website/trunk/include/versions.wmi Log: bump packages to 0.2.3.8-alpha and update tbbs for new firefox Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-11-24 07:58:02 UTC (rev 25234) +++ website/trunk/include/versions.wmi 2011-11-24 15:45:11 UTC (rev 25235) @@ -2,53 +2,53 @@ <define-tag version-alpha whitespace=delete>0.2.3.8-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.3.7-alpha</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.3.8-alpha</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.7-alpha</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.8-alpha</define-tag> <define-tag version-win32-bridge-bundle-stable whitespace=delete>0.2.2.34-<version-vidalia-stable></define-tag> <define-tag version-win32-relay-bundle-stable whitespace=delete>0.2.2.34-<version-vidalia-stable></define-tag> <define-tag version-win32-exit-bundle-stable whitespace=delete>0.2.2.34-<version-vidalia-stable>-2</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.7-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.7-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.7-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.8-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.8-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.8-alpha-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.7-alpha</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.8-alpha</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.34</define-tag> <define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.6-alpha</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.7-alpha</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.8-alpha</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.34</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.6-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.34-2</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.34-3</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.34</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.15-stable, zlib-1.2.5, openssl-1.0.0e</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>8.0</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.5, openssl-1.0.0e</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>8.0.1</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.34-2</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.34-2</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.34-3</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.34-3</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.34</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.15-stable, zlib-1.2.5, openssl-1.0.0e</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>8.0</define-tag> +<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.5, openssl-1.0.0e</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>8.0.1</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.34-2</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.34-2</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.34-3</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.34-3</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.34</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>8.0</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>8.0.1</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.15</define-tag>

1 0

[torbrowser/master] update recommended-versions to contain 2.2.34-3
by erinn＠torproject.org 24 Nov '11

24 Nov '11

commit 28ba76d41daecca923317122607af24575e9b37f Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Nov 23 16:28:50 2011 +0000 update recommended-versions to contain 2.2.34-3 --- build-scripts/recommended-versions | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index e626308..2cb0cda 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -3,5 +3,10 @@ "2.2.34-2-Linux-x86_64", "2.2.34-2-MacOS-i386", "2.2.34-2-MacOS-x86_64", -"2.2.34-2-Windows" +"2.2.34-2-Windows", +"2.2.34-3-Linux-i686", +"2.2.34-3-Linux-x86_64", +"2.2.34-3-MacOS-i386", +"2.2.34-3-MacOS-x86_64", +"2.2.34-3-Windows" ]

1 0

[torbrowser/master] disable gcc warnings on windows and osx until next stable release
by erinn＠torproject.org 24 Nov '11

24 Nov '11

commit 1ffcd9dafb9dd76c3a29dd686e05a71a95599fb5 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 24 14:07:11 2011 +0000 disable gcc warnings on windows and osx until next stable release --- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 9af4622..f53941b 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -99,7 +99,7 @@ build-libevent: TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk" -TOR_OPTS=--enable-gcc-warnings --enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking CC="gcc-4.0" +TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking CC="gcc-4.0" build-tor: cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) cd $(TOR_DIR) && make diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 6b74a0a..8f21e98 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -105,7 +105,7 @@ build-libevent: TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" -TOR_OPTS=--enable-gcc-warnings --enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor: cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) cd $(TOR_DIR) && make

1 0

[torbrowser/maint-2.2] update recommended-versions to contain 2.2.34-3
by erinn＠torproject.org 24 Nov '11

24 Nov '11

commit 28ba76d41daecca923317122607af24575e9b37f Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Nov 23 16:28:50 2011 +0000 update recommended-versions to contain 2.2.34-3 --- build-scripts/recommended-versions | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index e626308..2cb0cda 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -3,5 +3,10 @@ "2.2.34-2-Linux-x86_64", "2.2.34-2-MacOS-i386", "2.2.34-2-MacOS-x86_64", -"2.2.34-2-Windows" +"2.2.34-2-Windows", +"2.2.34-3-Linux-i686", +"2.2.34-3-Linux-x86_64", +"2.2.34-3-MacOS-i386", +"2.2.34-3-MacOS-x86_64", +"2.2.34-3-Windows" ]

1 0