- tor-commits - lists.torproject.org

[stem/master] Adding a set method for config instances
by atagar＠torproject.org 20 Nov '11

20 Nov '11

commit e62502661059e8a3c93babf3e15df8a0a07d529d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 20 14:22:07 2011 -0800 Adding a set method for config instances --- stem/util/conf.py | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index 799d81c..2bfa6e1 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -18,6 +18,7 @@ Config - Custom configuration. |- clear - empties our loaded configuration contents |- update - replaces mappings in a dictionary with the config's values |- keys - provides keys in the loaded configuration + |- set - sets the given key/value pair |- unused_keys - provides keys that have never been requested |- get - provides the value for a given key, with type inference |- get_value - provides the value for a given key as a string @@ -170,8 +171,7 @@ class Config(): else: key, value = line, "" - if key in self._contents: self._contents[key].append(value) - else: self._contents[key] = [value] + self.set(key, value) self._path = path self._contents_lock.release() @@ -247,6 +247,19 @@ class Config(): return set(self.get_keys()).difference(self._requested_keys) + def set(self, key, value): + """ + Appends the given key/value configuration mapping, behaving the same as if + we'd loaded this from a configuration file. + + Arguments: + key (str) - key for the configuration mapping + value (str) - value we're setting the mapping to + """ + + if key in self._contents: self._contents[key].append(value) + else: self._contents[key] = [value] + def get(self, key, default = None): """ Fetches the given configuration, using the key and default value to

1 0

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

20 Nov '11

commit e309b9a4f228dc7e8aa119809f80eef8b1a3b1e8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 20 21:15:04 2011 +0000 Update translations for orbot --- values-hu/strings.xml | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/values-hu/strings.xml b/values-hu/strings.xml index ef25b95..d4cc068 100644 --- a/values-hu/strings.xml +++ b/values-hu/strings.xml @@ -110,12 +110,12 @@ <string name="pref_node_configuration">Csomópont konfiguráció</string> <string name="pref_node_configuration_summary"></string> <string name="pref_entrance_node">Belépő csomópontok</string> - <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_summary">Ujjlenyomatok, becenevek, országok és címek az első ugráshoz</string> <string name="pref_entrance_node_dialog">Belépő csomópontok megadása</string> - <string name="pref_use_whispercore"></string> - <string name="pref_use_whispercore_summary"></string> + <string name="pref_use_whispercore">WhisperCore használata</string> + <string name="pref_use_whispercore_summary">Az eredeti NetFilter API használata amit a WhisperSystems biztosít (olyan eszköz szükséges, amire WhisperCore van telepítve)</string> <string name="pref_proxy_type_title">Proxy típus</string> - <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_summary">A Proxy szerver által használandó protokoll: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Adja meg a Proxy típust</string> <string name="pref_proxy_host_title">Proxy címe</string> <string name="pref_proxy_host_summary">Proxy szerver neve</string> @@ -124,14 +124,14 @@ <string name="pref_proxy_port_summary">Proxy szerver port</string> <string name="pref_proxy_port_dialog">Adja meg a Proxy portját</string> <string name="status">Állapot</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="setting_up_full_transparent_proxying_">A teljes körű Átlátszó proxyzás beállítása...</string> + <string name="setting_up_app_based_transparent_proxying_">Alkalmazásszintű Átlátszó proxyzás beállítása...</string> + <string name="transparent_proxying_enabled">Átlátszó proxyzás ENGEDÉLYEZVE</string> <string name="transproxy_enabled_for_tethering_"></string> <string name="warning_error_starting_transparent_proxying_"></string> - <string name="transproxy_rules_cleared"></string> + <string name="transproxy_rules_cleared">TransProxy szabályok létrehozva</string> <string name="couldn_t_start_tor_process_"></string> - <string name="privoxy_is_running_on_port_"></string> + <string name="privoxy_is_running_on_port_">A Privoxy a következő porton fut:</string> <string name="setting_up_port_based_transparent_proxying_"></string> <string name="bridge_error">Híd hiba</string> <string name="bridge_requires_ip"></string> @@ -139,10 +139,10 @@ <string name="error"></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="exit_nodes">Kilépési csomópontok</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="enter_exit_nodes">Kilépési csomópontok megadása</string> + <string name="exclude_nodes">Csomópontok kizárása</string> <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> <string name="enter_exclude_nodes"></string> <string name="strict_nodes"></string>

1 0

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

20 Nov '11

commit ba953e556834e8c84b57a244af050e2fe770af20 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 20 20:45:04 2011 +0000 Update translations for orbot --- values-hu/strings.xml | 90 ++++++++++++++++++++++++------------------------ 1 files changed, 45 insertions(+), 45 deletions(-) diff --git a/values-hu/strings.xml b/values-hu/strings.xml index ed55dff..ef25b95 100644 --- a/values-hu/strings.xml +++ b/values-hu/strings.xml @@ -11,9 +11,9 @@ <string name="status_activated">Csatlakozva a Tor hálózathoz</string> <string name="status_disabled">\"Orbot deaktiválva</string> <string name="status_shutting_down">Az Orbot leállítás alatt</string> - <string name="tor_process_starting"></string> - <string name="tor_process_complete"></string> - <string name="tor_process_waiting"></string> + <string name="tor_process_starting">A Tor kliens indítása...</string> + <string name="tor_process_complete">kész.</string> + <string name="tor_process_waiting">várakozik.</string> <string name="not_anonymous_yet">FIGYELEM: A forgalma még nem névtelen! Állítsa be alkalmazásait, hogy HTTP proxy használjanak a 127.0.0.1:8118 címen vagy SOCKS4A vagy SOCKS5 proxy-t a 127.0.0.1:9050 címen</string> <string name="menu_home">Kezdőlap</string> <string name="menu_browse">Tallóz</string> @@ -63,7 +63,7 @@ <string name="wizard_permissions_msg_stock"> Habár nem szükséges, az Orbot sokkal hatékonyabb eszköz lehet, ha a készüléknek van root hozzáférése. Használja az alábbi gombot, hogy szupererőt az Orbot-nak! </string> <string name="wizard_permissions_no_root">Ha nincs root hozzáférése, vagy lövése sincs miről beszélünk, csak legyen biztos abban,hogy olyan alkalmazást használ, amelyek képesek együttműködni az Orbot-tal.</string> <string name="wizard_permissions_consent">Értettem és root jog nélkül folytatnám tovább</string> - <string name="wizard_permission_enable_root">Root jog adása az Orbot részére</string> + <string name="wizard_permission_enable_root">Root jog megadása az Orbot részére</string> <string name="wizard_configure">Tor-izálás beállítása</string> <string name="wizard_configure_msg">Az Orbot lehetővé teszi, hogy az összes alkalmazás forgalmát VAGY az egyesével kiválasztott alkalmazások forgalmát keresztül küldje a Tor-on.</string> <string name="wizard_configure_all">Minden alkalmazás keresztülproxyzása a Tor-on</string> @@ -87,43 +87,43 @@ <string name="pref_start_boot_title">Az Orbot indítása bekapcsoláskor</string> <string name="pref_start_boot_summary">Automatikusan elindítja az Orbot-ot, és csatlakozik a hálózathoz, amikor az Android eszköz elindul</string> <string name="wizard_title_msg"></string> - <string name="wizard_warning_title"></string> - <string name="wizard_warning_msg"></string> - <string name="wizard_permissions_title"></string> + <string name="wizard_warning_title">Figyelem</string> + <string name="wizard_warning_msg">Az Orbot telepítése nem fogja automatikusan névtelenné tenni a mobil forgalmát.\n\nMegfelelően konfigurálnia kell az Orbot-ot az eszközt és az alkalmazásokat a sikeres Tor használathoz.</string> + <string name="wizard_permissions_title">Jogosultságok</string> <string name="wizard_permissions_root_msg1"></string> <string name="wizard_permissions_root_msg2"></string> <string name="wizard_permissions_no_root_msg"></string> - <string name="wizard_tips_title"></string> - <string name="wizard_tips_gibberbot"></string> - <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_title">Orbot-engedélyezett Alkalmazások</string> + <string name="wizard_tips_gibberbot">Gibberbot: Biztonságos csevegő alkalmazás Off-the-Record titkosítással</string> + <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (csak Android 1.x) - Böngésző, kifejezetten adatvédelemre és az Orbot-hoz</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_none"></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="wizard_transproxy_title">Átlátszó proxyzás</string> + <string name="wizard_transproxy_msg">Ez lehetővé teszi az alkalmazások számára a Tor-on keresztül kommunikálást, bármilyen konfiguráció nélkül.</string> + <string name="wizard_transproxy_hint">(Jelölje ezt négyzetet, ha halvány lila fogalma sincs miről van itt szó.)</string> + <string name="wizard_transproxy_none">Nincs</string> + <string name="pref_transparent_tethering_title">Tor Tethering</string> + <string name="pref_transparent_tethering_summary">A Tor Átlátszó Proxy-zás engedélyezése a Wifi és az USB Tether eszközök felé (újraindítást igényel)</string> + <string name="button_grant_superuser">Superuser hozzáférés kérése</string> + <string name="pref_select_apps">Alkalmazások kiválasztása</string> + <string name="pref_select_apps_summary">Válassza ki a Tor-on keresztül route-olandó alkalmazásokat</string> + <string name="pref_node_configuration">Csomópont konfiguráció</string> <string name="pref_node_configuration_summary"></string> - <string name="pref_entrance_node"></string> + <string name="pref_entrance_node">Belépő csomópontok</string> <string name="pref_entrance_node_summary"></string> - <string name="pref_entrance_node_dialog"></string> + <string name="pref_entrance_node_dialog">Belépő csomópontok megadása</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_title">Proxy típus</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="pref_proxy_type_dialog">Adja meg a Proxy típust</string> + <string name="pref_proxy_host_title">Proxy címe</string> + <string name="pref_proxy_host_summary">Proxy szerver neve</string> + <string name="pref_proxy_host_dialog">Adja meg a Proxy gép nevét</string> + <string name="pref_proxy_port_title">Proxy port</string> + <string name="pref_proxy_port_summary">Proxy szerver port</string> + <string name="pref_proxy_port_dialog">Adja meg a Proxy portját</string> + <string name="status">Állapot</string> <string name="setting_up_full_transparent_proxying_"></string> <string name="setting_up_app_based_transparent_proxying_"></string> <string name="transparent_proxying_enabled"></string> @@ -133,7 +133,7 @@ <string name="couldn_t_start_tor_process_"></string> <string name="privoxy_is_running_on_port_"></string> <string name="setting_up_port_based_transparent_proxying_"></string> - <string name="bridge_error"></string> + <string name="bridge_error">Híd hiba</string> <string name="bridge_requires_ip"></string> <string name="send_email_for_bridges"></string> <string name="error"></string> @@ -163,28 +163,28 @@ <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="reachable_ports">Elérhető portok</string> <string name="ports_reachable_behind_a_restrictive_firewall"></string> <string name="enter_ports"></string> - <string name="enable_hidden_services"></string> + <string name="enable_hidden_services">Rejtett szolgáltatások engedélyezése</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="hidden_service_ports">Rejtett szolgáltatás portok</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="project_home">Projekt honlap(ok):</string> + <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="the_tor_license">A Tor Licensz</string> + <string name="https_torproject_org">https://torproject.org</string> + <string name="third_party_software">Külső szoftverek: </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"></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="unable_to_start_tor">Sikertelen a Tor elindítása:</string> </resources>

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 20 Nov '11

20 Nov '11

commit 7823272c198602ff576c95c0e6c4e2d7a4540320 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 20 20:45:03 2011 +0000 Update translations for gettor --- hu/gettor.po | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/hu/gettor.po b/hu/gettor.po index 59bd70f..19a24dd 100644 --- a/hu/gettor.po +++ b/hu/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2011-11-14 04:06+0000\n" +"PO-Revision-Date: 2011-11-20 20:29+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -61,6 +61,8 @@ msgid "" "If you have any questions or it doesn't work, you can contact a\n" "human at this support email address: help(a)rt.torproject.org" msgstr "" +"Ha bármilyen kérdése van, vagy nem működik, felveheti a kapcsolatot a humán " +"segítségnyújtással, a támogató email címen: help(a)rt.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -601,5 +603,10 @@ msgid "" " https://tor.beme-it.de/dist/torbrowser/\n" " https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" msgstr "" +"Sajnáljuk, de a kért csomag (%s) túl nagy a szolgáltatója számára, hogy csatolmányban elküldjük. Próbáljon meg másik szolgáltatót használni, ami lehetővé teszi nagyobb csatolmányok fogadását, vagy megpróbálhatja a következő tükrök valamelyikét:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/"

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 4d8306e0e92200e1a25a073480ec342e22e590b7 Merge: 9725646 be6928d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 10:42:34 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug4410 | 5 +++++ src/or/routerparse.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-)

1 0

[tor/release-0.2.2] Don't leak an extend_info_t in rend_client_any_intro_points_usable
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 65a0d7e7ef03cc2390cad81264e451e59206842b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Nov 7 08:35:51 2011 -0800 Don't leak an extend_info_t in rend_client_any_intro_points_usable --- changes/bug4424 | 6 ++++++ src/or/rendclient.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/changes/bug4424 b/changes/bug4424 new file mode 100644 index 0000000..6928745 --- /dev/null +++ b/changes/bug4424 @@ -0,0 +1,6 @@ + o Major bugfixes + + - Don't leak memory when we check whether a hidden service + descriptor has any usable introduction points left. Fixes bug + 4424. Bugfix on 0.2.2.25-alpha; found by frosty_un. + diff --git a/src/or/rendclient.c b/src/or/rendclient.c index f84475a..3dfca58 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -952,8 +952,14 @@ rend_client_get_random_intro_impl(const rend_cache_entry_t *entry, int rend_client_any_intro_points_usable(const rend_cache_entry_t *entry) { - return rend_client_get_random_intro_impl( - entry, get_options()->StrictNodes, 0) != NULL; + extend_info_t *extend_info = + rend_client_get_random_intro_impl(entry, get_options()->StrictNodes, 0); + int rv = extend_info != NULL; + + if (extend_info != NULL) + extend_info_free(extend_info); + + return rv; } /** Client-side authorizations for hidden services; map of onion address to

1 0

[tor/release-0.2.2] Merge branch 'bug4424' into maint-0.2.2
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit ca282e53263de564774944a8aa93e88271983461 Merge: 4d8306e 02d89c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 11:47:28 2011 -0500 Merge branch 'bug4424' into maint-0.2.2 changes/bug4424 | 6 ++++++ src/or/rendclient.c | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.2] Remove an extraneous "if" in the 4424 fix
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 02d89c5c663ec5370386de0173accaa66c1e69f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 11:46:51 2011 -0500 Remove an extraneous "if" in the 4424 fix --- src/or/rendclient.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 3dfca58..f951dad 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -954,11 +954,10 @@ rend_client_any_intro_points_usable(const rend_cache_entry_t *entry) { extend_info_t *extend_info = rend_client_get_random_intro_impl(entry, get_options()->StrictNodes, 0); - int rv = extend_info != NULL; - if (extend_info != NULL) - extend_info_free(extend_info); + int rv = (extend_info != NULL); + extend_info_free(extend_info); return rv; }

1 0

[tor/release-0.2.2] Robert says that this bug was not in fact one of frosty's
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 8ba1cf3007fccafa764e8f96e346354dca45f2ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 11:54:54 2011 -0500 Robert says that this bug was not in fact one of frosty's --- changes/bug4424 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/changes/bug4424 b/changes/bug4424 index 6928745..443625d 100644 --- a/changes/bug4424 +++ b/changes/bug4424 @@ -2,5 +2,5 @@ - Don't leak memory when we check whether a hidden service descriptor has any usable introduction points left. Fixes bug - 4424. Bugfix on 0.2.2.25-alpha; found by frosty_un. + 4424. Bugfix on 0.2.2.25-alpha.

1 0

[tor/release-0.2.2] Include HiddenServiceDir in some warning messages
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 565463243c4e019bfd8dff965582f02a2aa05e14 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Nov 7 17:02:50 2011 -0800 Include HiddenServiceDir in some warning messages --- changes/bug4426 | 8 ++++++++ src/or/rendservice.c | 9 ++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/changes/bug4426 b/changes/bug4426 new file mode 100644 index 0000000..1322243 --- /dev/null +++ b/changes/bug4426 @@ -0,0 +1,8 @@ + o Minor features: + + - When Tor ignores a hidden service specified in its + configuration, include the hidden service's directory in the + warning message. Previously, we would only tell the user that + some hidden service was ignored. Bugfix on 0.0.6; fixes bug + 4426. + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 0f57319..25695c5 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -171,14 +171,17 @@ rend_add_service(rend_service_t *service) if (service->auth_type != REND_NO_AUTH && smartlist_len(service->clients) == 0) { - log_warn(LD_CONFIG, "Hidden service with client authorization but no " - "clients; ignoring."); + log_warn(LD_CONFIG, "Hidden service (%s) with client authorization but no " + "clients; ignoring.", + esc_for_log(service->directory)); rend_service_free(service); return; } if (!smartlist_len(service->ports)) { - log_warn(LD_CONFIG, "Hidden service with no ports configured; ignoring."); + log_warn(LD_CONFIG, "Hidden service (%s) with no ports configured; " + "ignoring.", + esc_for_log(service->directory)); rend_service_free(service); } else { int dupe = 0;

1 0