December 2015 - tor-commits - lists.torproject.org

[stem/master] Can't do nested inline sphinx markup
by atagar＠torproject.org 07 Dec '15

07 Dec '15

commit 4163f9e627a24731763e390c8f6ffd061e061777 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Dec 7 07:59:38 2015 -0800 Can't do nested inline sphinx markup Turns out we can't do :class: and such when we have bold text. This is rendering as... The dictionary you get from this is manged by the :class:`~stem.util.conf.Config` class and should be treated as being read-only. Feels like a Sphinx bug but they mention it on... http://sphinx-doc.org/rest.html#gotchas --- stem/util/conf.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index c2cfd5f..fcf6858 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -215,9 +215,8 @@ def config_dict(handle, conf_mappings, handler = None): For more information about how we convert types see our :func:`~stem.util.conf.Config.get` method. - **The dictionary you get from this is manged by the - :class:`~stem.util.conf.Config` class and should be treated as being - read-only.** + **The dictionary you get from this is manged by the Config class and should + be treated as being read-only.** :param str handle: unique identifier for a config instance :param dict conf_mappings: config key/value mappings used as our defaults

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 07 Dec '15

07 Dec '15

commit f8cb6a9e16201c3d8de77b89327159691a1e42c8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 7 16:15:29 2015 +0000 Update translations for tails-greeter_completed --- es_MX/es_MX.po | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 208 insertions(+) diff --git a/es_MX/es_MX.po b/es_MX/es_MX.po new file mode 100644 index 0000000..0221cc8 --- /dev/null +++ b/es_MX/es_MX.po @@ -0,0 +1,208 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Arturo J. Gueta Lozano <arturo(a)gueta.net>, 2015 +# Jose Ramon Munguia <ramon.munguia(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-11-02 21:29+0100\n" +"PO-Revision-Date: 2015-12-07 16:05+0000\n" +"Last-Translator: Arturo J. Gueta Lozano <arturo(a)gueta.net>\n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../glade/persistencewindow.glade.h:1 +msgid "Forward" +msgstr "Adelante" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 +msgid "Login" +msgstr "Iniciar Sesión" + +#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "Bienvenido a Tails" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Use persistence?" +msgstr "Utilizar Persistencia?" + +#: ../glade/persistencewindow.glade.h:5 +msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentación</a>" + +#: ../glade/persistencewindow.glade.h:6 +msgid "Yes" +msgstr "Si" + +#: ../glade/persistencewindow.glade.h:7 +msgid "No" +msgstr "No" + +#: ../glade/persistencewindow.glade.h:8 +msgid "Passphrase:" +msgstr "Palabra clave:" + +#: ../glade/persistencewindow.glade.h:9 +msgid "Read-Only?" +msgstr "Solo Lectura?" + +#: ../glade/persistencewindow.glade.h:10 +msgid "Wrong passphrase. Please try again." +msgstr "Palabra clave incorrecta. Por favor intenta de nuevo." + +#: ../glade/persistencewindow.glade.h:11 +msgid "More options?" +msgstr "¿Mas opciones?" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "Password de Administrador" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentación</a>" + +#: ../glade/optionswindow.glade.h:5 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "Ingrese una contraseña de administrador en caso de que necesites realizar tareas de administrador.\nEn caso contrario será desactivado por motivos de seguridad." + +#: ../glade/optionswindow.glade.h:7 +msgid "Password:" +msgstr "Contraseña:" + +#: ../glade/optionswindow.glade.h:8 +msgid "Verify Password:" +msgstr "Verificar Contraseña:" + +#: ../glade/optionswindow.glade.h:9 +msgid "Passwords do not match" +msgstr "Las contraseñas no coinciden" + +#: ../glade/optionswindow.glade.h:10 +msgid "Windows camouflage" +msgstr "Camuflaje de Windows" + +#: ../glade/optionswindow.glade.h:11 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentación</a>" + +#: ../glade/optionswindow.glade.h:12 +msgid "" +"This option makes Tails look more like Microsoft Windows 8. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "Esta opción hace a Tails parecerse mas a Windows 8. Puede ser útil en lugares públicos a fin de evitar levantar sospechas." + +#: ../glade/optionswindow.glade.h:13 +msgid "Activate Microsoft Windows 8 Camouflage" +msgstr "Activar Camuflaje Microsoft Windows 8" + +#: ../glade/optionswindow.glade.h:14 +msgid "MAC address spoofing" +msgstr "MAC address spoofing" + +#: ../glade/optionswindow.glade.h:15 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentación</a>" + +#: ../glade/optionswindow.glade.h:16 +msgid "" +"Spoofing MAC addresses hides the serial number of your network cards to the " +"local networks. This can help you hide your geographical location." +msgstr "Spoofing MAC addresses oculta el numero de serie de tu tarjeta e red dentro de la red local. Esto te ayuda a ocultar tu ubicación geográfica." + +#: ../glade/optionswindow.glade.h:17 +msgid "" +"It is generally safer to spoof MAC addresses, but it might also raise " +"suspicion or cause network connection problems." +msgstr "Generalmente es mas seguro el Spoof MAC addresses, pero también podría levantar sospechas o causar problemas de conexión de la red." + +#: ../glade/optionswindow.glade.h:18 +msgid "Spoof all MAC addresses" +msgstr "Husmear en todas las MAC addesses" + +#: ../glade/optionswindow.glade.h:19 +msgid "Network configuration" +msgstr "Configuración de red" + +#: ../glade/optionswindow.glade.h:20 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentación</a>" + +#: ../glade/optionswindow.glade.h:21 +msgid "" +"This computer's Internet connection is clear of obstacles. You would like to" +" connect directly to the Tor network." +msgstr "La conexión a internet de esta computadora está libre de obstáculos. ¿Deseas conectarte directamente a la red de Tor?" + +#: ../glade/optionswindow.glade.h:22 +msgid "" +"This computer's Internet connection is censored, filtered, or proxied. You " +"need to configure bridge, firewall, or proxy settings." +msgstr "La conexión a intetnet de esta computadora está censurada, filtrada o pasa a través de un proxy. Es necesario configurar los ajustes del puente, cortafuegos o proxy." + +#: ../glade/optionswindow.glade.h:23 +msgid "Disable all networking" +msgstr "Desactivar toda actividad." + +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr "." + +#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43 +msgid "Language" +msgstr "Lenguaje" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "Lugar" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "Diseño" + +#: ../tailsgreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "live-persist falló regresando codigo de error %(returncode)s:%(stderr)s" + +#: ../tailsgreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "cryptsetup falló regresando codigo de error %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../tailsgreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "live-persist falló regresando codigo de error %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 +msgid "Other..." +msgstr "Otro..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 07 Dec '15

07 Dec '15

commit 8a6c994658164a4f789acc3b1a244195da5b5da9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 7 16:15:25 2015 +0000 Update translations for tails-greeter --- es_MX/es_MX.po | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/es_MX/es_MX.po b/es_MX/es_MX.po index cdb328c..0221cc8 100644 --- a/es_MX/es_MX.po +++ b/es_MX/es_MX.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Arturo J. Gueta Lozano <arturo(a)gueta.net>, 2015 # Jose Ramon Munguia <ramon.munguia(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-26 17:51+0100\n" -"PO-Revision-Date: 2015-10-27 10:10+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2015-11-02 21:29+0100\n" +"PO-Revision-Date: 2015-12-07 16:05+0000\n" +"Last-Translator: Arturo J. Gueta Lozano <arturo(a)gueta.net>\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +33,7 @@ msgstr "Bienvenido a Tails" #: ../glade/persistencewindow.glade.h:4 msgid "Use persistence?" -msgstr "" +msgstr "Utilizar Persistencia?" #: ../glade/persistencewindow.glade.h:5 msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" @@ -64,19 +65,19 @@ msgstr "¿Mas opciones?" #: ../glade/optionswindow.glade.h:3 msgid "Administration password" -msgstr "" +msgstr "Password de Administrador" #: ../glade/optionswindow.glade.h:4 msgid "" "<a " "href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentación</a>" #: ../glade/optionswindow.glade.h:5 msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "" +msgstr "Ingrese una contraseña de administrador en caso de que necesites realizar tareas de administrador.\nEn caso contrario será desactivado por motivos de seguridad." #: ../glade/optionswindow.glade.h:7 msgid "Password:" @@ -98,7 +99,7 @@ msgstr "Camuflaje de Windows" msgid "" "<a " "href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentación</a>" #: ../glade/optionswindow.glade.h:12 msgid "" @@ -112,39 +113,39 @@ msgstr "Activar Camuflaje Microsoft Windows 8" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" -msgstr "" +msgstr "MAC address spoofing" #: ../glade/optionswindow.glade.h:15 msgid "" "<a " "href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentación</a>" #: ../glade/optionswindow.glade.h:16 msgid "" "Spoofing MAC addresses hides the serial number of your network cards to the " "local networks. This can help you hide your geographical location." -msgstr "" +msgstr "Spoofing MAC addresses oculta el numero de serie de tu tarjeta e red dentro de la red local. Esto te ayuda a ocultar tu ubicación geográfica." #: ../glade/optionswindow.glade.h:17 msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems." -msgstr "" +msgstr "Generalmente es mas seguro el Spoof MAC addresses, pero también podría levantar sospechas o causar problemas de conexión de la red." #: ../glade/optionswindow.glade.h:18 msgid "Spoof all MAC addresses" -msgstr "" +msgstr "Husmear en todas las MAC addesses" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" -msgstr "" +msgstr "Configuración de red" #: ../glade/optionswindow.glade.h:20 msgid "" "<a " "href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentación</a>" #: ../glade/optionswindow.glade.h:21 msgid "" @@ -160,11 +161,11 @@ msgstr "La conexión a intetnet de esta computadora está censurada, filtrada o #: ../glade/optionswindow.glade.h:23 msgid "Disable all networking" -msgstr "" +msgstr "Desactivar toda actividad." #: ../glade/langpanel.glade.h:1 msgid " " -msgstr "" +msgstr "." #: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43 msgid "Language" @@ -172,18 +173,18 @@ msgstr "Lenguaje" #: ../glade/langpanel.glade.h:3 msgid "Locale" -msgstr "" +msgstr "Lugar" #: ../glade/langpanel.glade.h:4 msgid "Layout" -msgstr "" +msgstr "Diseño" #: ../tailsgreeter/persistence.py:59 #, python-format msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" -msgstr "" +msgstr "live-persist falló regresando codigo de error %(returncode)s:%(stderr)s" #: ../tailsgreeter/persistence.py:99 #, python-format @@ -191,7 +192,7 @@ msgid "" "cryptsetup failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "" +msgstr "cryptsetup falló regresando codigo de error %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../tailsgreeter/persistence.py:124 #, python-format @@ -199,7 +200,7 @@ msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "" +msgstr "live-persist falló regresando codigo de error %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 #: ../tailsgreeter/langpanel.py:183

1 0

[tor/master] Merge remote-tracking branch 'teor/exitpolicy-multicast'
by nickm＠torproject.org 07 Dec '15

07 Dec '15

commit 79fdfd52313cfb4032d70cf668da8060220a580a Merge: f727ebc 0219589 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 7 10:23:30 2015 -0500 Merge remote-tracking branch 'teor/exitpolicy-multicast' changes/bug17763 | 5 +++++ src/common/address.c | 2 +- src/common/address.h | 2 +- src/or/policies.c | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-)

1 0

[tor/master] Consistently ignore multicast in internal reject private exit policies
by nickm＠torproject.org 07 Dec '15

07 Dec '15

commit 021958934f02919eabca884f935cb27a013b4ab9 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon Dec 7 14:44:23 2015 +1100 Consistently ignore multicast in internal reject private exit policies Consistently ignore multicast addresses when automatically generating reject private exit policies. Closes ticket 17763. Bug fix on 10a6390deb3c9, not in any released version of Tor. Patch by "teor". --- changes/bug17763 | 5 +++++ src/common/address.c | 2 +- src/common/address.h | 2 +- src/or/policies.c | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changes/bug17763 b/changes/bug17763 new file mode 100644 index 0000000..d565d13 --- /dev/null +++ b/changes/bug17763 @@ -0,0 +1,5 @@ + o Minor bug fixes (exit policies): + - Consistently ignore multicast addresses when automatically + generating reject private exit policies. + Closes ticket 17763. Bug fix on 10a6390deb3c9, + not in any released version of Tor. Patch by "teor". diff --git a/src/common/address.c b/src/common/address.c index aef229b..6277641 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1528,7 +1528,7 @@ get_interface_addresses_raw,(int severity)) } /** Return true iff a is a multicast address. */ -STATIC int +int tor_addr_is_multicast(const tor_addr_t *a) { sa_family_t family = tor_addr_family(a); diff --git a/src/common/address.h b/src/common/address.h index d2841e1..34959fc 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -221,6 +221,7 @@ int tor_addr_is_internal_(const tor_addr_t *ip, int for_listening, const char *filename, int lineno); #define tor_addr_is_internal(addr, for_listening) \ tor_addr_is_internal_((addr), (for_listening), SHORT_FILE__, __LINE__) +int tor_addr_is_multicast(const tor_addr_t *a); /** Longest length that can be required for a reverse lookup name. */ /* 32 nybbles, 32 dots, 8 characters of "ip6.arpa", 1 NUL: 73 characters. */ @@ -311,7 +312,6 @@ tor_addr_port_t *tor_addr_port_new(const tor_addr_t *addr, uint16_t port); #ifdef ADDRESS_PRIVATE MOCK_DECL(smartlist_t *,get_interface_addresses_raw,(int severity)); -STATIC int tor_addr_is_multicast(const tor_addr_t *a); MOCK_DECL(int,get_interface_address6_via_udp_socket_hack,(int severity, sa_family_t family, tor_addr_t *addr)); diff --git a/src/or/policies.c b/src/or/policies.c index 126ba46..943b0c4 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -907,7 +907,8 @@ addr_policy_append_reject_addr(smartlist_t **dest, const tor_addr_t *addr) static int tor_addr_is_public_for_reject(const tor_addr_t *addr) { - return !tor_addr_is_null(addr) && !tor_addr_is_internal(addr, 0); + return (!tor_addr_is_null(addr) && !tor_addr_is_internal(addr, 0) + && !tor_addr_is_multicast(addr)); } /* Add "reject addr:*" to dest, creating the list as needed.

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 07 Dec '15

07 Dec '15

commit fef90977fd23be73a6bf88f2991de705c65ed701 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 7 15:15:41 2015 +0000 Update translations for tor-launcher-network-settings_completed --- fr/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd index c6eb480..cfc1c0f 100644 --- a/fr/network-settings.dtd +++ b/fr/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Paramètres du Réseau Tor"> +<!ENTITY torsettings.dialog.title "Paramètres du réseau Tor">  <!ENTITY torlauncher.localePicker.title "Language du navigateur Tor">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 07 Dec '15

07 Dec '15

commit e8d9c9ccdde62b964cc2a305530738d7926071e0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 7 15:15:37 2015 +0000 Update translations for tor-launcher-network-settings --- fr/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd index c6eb480..cfc1c0f 100644 --- a/fr/network-settings.dtd +++ b/fr/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Paramètres du Réseau Tor"> +<!ENTITY torsettings.dialog.title "Paramètres du réseau Tor">  <!ENTITY torlauncher.localePicker.title "Language du navigateur Tor">

1 0

[tor/master] Update comment: get_connection_array no longer takes "n"
by nickm＠torproject.org 07 Dec '15

07 Dec '15

commit fb3e862b8690101276cf2dfe8a5fc2dfb69fb71f Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Dec 1 13:08:37 2015 +1100 Update comment: get_connection_array no longer takes "n" --- src/or/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 1469fd1..3f166c8 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -500,8 +500,7 @@ connection_in_array(connection_t *conn) return smartlist_contains(connection_array, conn); } -/** Set *array to an array of all connections, and *n - * to the length of the array. *array and *n must not +/** Set *array to an array of all connections. *array must not * be modified. */ smartlist_t *

1 0

[tor/master] Move a comment in router_get_my_descriptor to the correct line
by nickm＠torproject.org 07 Dec '15

07 Dec '15

commit 3461bcb10e1910d1bd46a887abe5bf3bd139f0d2 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Dec 4 18:13:29 2015 +1100 Move a comment in router_get_my_descriptor to the correct line --- src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/router.c b/src/or/router.c index 9020345..bed9dc5 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1781,9 +1781,9 @@ router_get_my_descriptor(void) const char *body; if (!router_get_my_routerinfo()) return NULL; - /* Make sure this is nul-terminated. */ tor_assert(desc_routerinfo->cache_info.saved_location == SAVED_NOWHERE); body = signed_descriptor_get_body(&desc_routerinfo->cache_info); + /* Make sure this is nul-terminated. */ tor_assert(!body[desc_routerinfo->cache_info.signed_descriptor_len]); log_debug(LD_GENERAL,"my desc is '%s'", body); return body;

1 0

[tor/master] Comment-only changes to connection_connect
by nickm＠torproject.org 07 Dec '15

07 Dec '15

commit b7525c39bff1f43b1437960d7030693942e33274 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon Dec 7 15:59:34 2015 +1100 Comment-only changes to connection_connect port is in host order (addr is tor_addr_t, endianness is abstracted). addr and port can be different to conn->addr and conn->port if connecting via a proxy. --- src/or/connection.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/or/connection.c b/src/or/connection.c index b31b99c..5ac0cb6 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1708,10 +1708,13 @@ connection_connect_sockaddr(connection_t *conn, } /** Take conn, make a nonblocking socket; try to connect to - * addr:port (they arrive in *host order*). If fail, return -1 and if + * addr:port (port arrives in *host order*). If fail, return -1 and if * applicable put your best guess about errno into *socket_error. * Else assign s to conn-\>s: if connected return 1, if EAGAIN return 0. * + * addr:port can be different to conn->addr:conn->port if connecting through + * a proxy. + * * address is used to make the logs useful. * * On success, add conn to the list of polled connections.

1 0