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

[tor/master] Move connection_free_all() to the bottom of connection.c to enjoy maximum visibility.
by nickm＠torproject.org 15 Aug '11

15 Aug '11

commit a5fd07d178d1260ec7073c6ea0db185b8527fc68 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Aug 13 20:29:22 2011 +0200 Move connection_free_all() to the bottom of connection.c to enjoy maximum visibility. --- src/or/connection.c | 69 +++++++++++++++++++++++++-------------------------- 1 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index b885d09..67e9442 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -561,41 +561,6 @@ connection_free(connection_t *conn) _connection_free(conn); } -/** Call _connection_free() on every connection in our array, and release all - * storage held by connection.c. This is used by cpuworkers and dnsworkers - * when they fork, so they don't keep resources held open (especially - * sockets). - * - * Don't do the checks in connection_free(), because they will - * fail. - */ -void -connection_free_all(void) -{ - smartlist_t *conns = get_connection_array(); - - /* We don't want to log any messages to controllers. */ - SMARTLIST_FOREACH(conns, connection_t *, conn, - if (conn->type == CONN_TYPE_CONTROL) - TO_CONTROL_CONN(conn)->event_mask = 0); - - control_update_global_event_mask(); - - /* Unlink everything from the identity map. */ - connection_or_clear_identity_map(); - - /* Clear out our list of broken connections */ - clear_broken_connection_map(0); - - SMARTLIST_FOREACH(conns, connection_t *, conn, _connection_free(conn)); - - if (outgoing_addrs) { - SMARTLIST_FOREACH(outgoing_addrs, void*, addr, tor_free(addr)); - smartlist_free(outgoing_addrs); - outgoing_addrs = NULL; - } -} - /** * Called when we're about to finally unlink and free a connection: * perform necessary accounting and cleanup @@ -4163,3 +4128,37 @@ proxy_type_to_string(int proxy_type) return NULL; /*Unreached*/ } +/** Call _connection_free() on every connection in our array, and release all + * storage held by connection.c. This is used by cpuworkers and dnsworkers + * when they fork, so they don't keep resources held open (especially + * sockets). + * + * Don't do the checks in connection_free(), because they will + * fail. + */ +void +connection_free_all(void) +{ + smartlist_t *conns = get_connection_array(); + + /* We don't want to log any messages to controllers. */ + SMARTLIST_FOREACH(conns, connection_t *, conn, + if (conn->type == CONN_TYPE_CONTROL) + TO_CONTROL_CONN(conn)->event_mask = 0); + + control_update_global_event_mask(); + + /* Unlink everything from the identity map. */ + connection_or_clear_identity_map(); + + /* Clear out our list of broken connections */ + clear_broken_connection_map(0); + + SMARTLIST_FOREACH(conns, connection_t *, conn, _connection_free(conn)); + + if (outgoing_addrs) { + SMARTLIST_FOREACH(outgoing_addrs, void*, addr, tor_free(addr)); + smartlist_free(outgoing_addrs); + outgoing_addrs = NULL; + } +}

1 0

[tor/master] Free global_rate_limit in connection_free_all().
by nickm＠torproject.org 15 Aug '11

15 Aug '11

commit ec8d0a6d83adec7953839937c7fcbe315284c263 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Aug 13 20:37:13 2011 +0200 Free global_rate_limit in connection_free_all(). --- src/or/connection.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 67e9442..2087ced 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4161,4 +4161,9 @@ connection_free_all(void) smartlist_free(outgoing_addrs); outgoing_addrs = NULL; } + +#ifdef USE_BUFFEREVENTS + if (global_rate_limit) + bufferevent_rate_limit_group_free(global_rate_limit); +#endif }

1 0

[tor/master] Merge remote-tracking branch 'asn/bug3728'
by nickm＠torproject.org 15 Aug '11

15 Aug '11

commit 2dc40b9c49ec13ed24b5a541ce6cfecfe79effbf Merge: aeb2752 ec8d0a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 15 11:06:50 2011 -0400 Merge remote-tracking branch 'asn/bug3728' src/or/connection.c | 74 +++++++++++++++++++++++++++------------------------ 1 files changed, 39 insertions(+), 35 deletions(-)

1 0

[tor/master] Remove extra quotation marks around the result of esc_for_log
by nickm＠torproject.org 15 Aug '11

15 Aug '11

commit 03f6ee8c5f270497b4990b98bc3d23ffea6c75a9 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Aug 15 04:53:11 2011 -0700 Remove extra quotation marks around the result of esc_for_log --- changes/bug3732 | 7 +++++++ src/or/control.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/changes/bug3732 b/changes/bug3732 new file mode 100644 index 0000000..7a71d1a --- /dev/null +++ b/changes/bug3732 @@ -0,0 +1,7 @@ + o Major bugfixes: + + - Remove an extra pair of quotation marks around the error + message in control-port STATUS_GENERAL BUG events. Bugfix on + 0.1.2.6-alpha; fixes bug 3732. + + diff --git a/src/or/control.c b/src/or/control.c index 954da65..de9dca0 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3480,7 +3480,7 @@ control_event_logmsg(int severity, uint32_t domain, const char *msg) severity <= LOG_NOTICE) { char *esc = esc_for_log(msg); ++disable_log_messages; - control_event_general_status(severity, "BUG REASON=\"%s\"", esc); + control_event_general_status(severity, "BUG REASON=%s", esc); --disable_log_messages; tor_free(esc); }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 15 Aug '11

15 Aug '11

commit aeb27526f81297ed265f93ee82a0ed2eabbd451e Merge: 0ddc8de 03f6ee8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 15 10:54:55 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3732 | 7 +++++++ src/or/control.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Remove extra quotation marks around the result of esc_for_log
by nickm＠torproject.org 15 Aug '11

15 Aug '11

commit 03f6ee8c5f270497b4990b98bc3d23ffea6c75a9 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Aug 15 04:53:11 2011 -0700 Remove extra quotation marks around the result of esc_for_log --- changes/bug3732 | 7 +++++++ src/or/control.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/changes/bug3732 b/changes/bug3732 new file mode 100644 index 0000000..7a71d1a --- /dev/null +++ b/changes/bug3732 @@ -0,0 +1,7 @@ + o Major bugfixes: + + - Remove an extra pair of quotation marks around the error + message in control-port STATUS_GENERAL BUG events. Bugfix on + 0.1.2.6-alpha; fixes bug 3732. + + diff --git a/src/or/control.c b/src/or/control.c index 954da65..de9dca0 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3480,7 +3480,7 @@ control_event_logmsg(int severity, uint32_t domain, const char *msg) severity <= LOG_NOTICE) { char *esc = esc_for_log(msg); ++disable_log_messages; - control_event_general_status(severity, "BUG REASON=\"%s\"", esc); + control_event_general_status(severity, "BUG REASON=%s", esc); --disable_log_messages; tor_free(esc); }

1 0

[tor/master] Oops; _actually_ enable microdesc-by-default for clients
by nickm＠torproject.org 15 Aug '11

15 Aug '11

commit 0ddc8de0b60ecbda3e7bf1df3afc4ef28275dc7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 15 10:52:23 2011 -0400 Oops; _actually_ enable microdesc-by-default for clients It turns out that it wasn't enough to set the configuration to "auto", since the correct behavior for "auto" had been disabled in microdesc.c. :p (Hasn't been in a release yet, so doesn't need a changes entry.) --- src/or/microdesc.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 1b0c333..627fad5 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -698,14 +698,8 @@ we_use_microdescriptors_for_circuits(const or_options_t *options) int ret = options->UseMicrodescriptors; if (ret == -1) { /* UseMicrodescriptors is "auto"; we need to decide: */ -#if 0 /* So we decide that we'll use microdescriptors iff we are not a server */ ret = ! server_mode(options); -#else - /* We don't use microdescs for now: not enough caches are running - * 0.2.3.1-alpha */ - ret = 0; -#endif } return ret; }

1 0

[vidalia/master] Update version for 0.2.13 release
by chiiph＠torproject.org 13 Aug '11

13 Aug '11

commit e4180f263771ad3de8d813ed7e414f9e0cd0d615 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Aug 13 00:30:18 2011 -0300 Update version for 0.2.13 release --- CMakeLists.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5bb9f9..438a1be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ set(VER_MAJOR "0") set(VER_MINOR "2") set(VER_PATCH "13") -set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-git") +set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}") message(STATUS "Configuring Vidalia ${VERSION}") project(Vidalia)

1 0

[vidalia/master] Merge remote-tracking branch 'runa/master'
by chiiph＠torproject.org 13 Aug '11

13 Aug '11

commit ca275e302f8b17c669c0377432e1d31784b86701 Merge: 53567a2 394c229 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Wed Aug 10 09:42:29 2011 -0300 Merge remote-tracking branch 'runa/master' pkg/win32/po/af/vidalia_af.po | 2 +- pkg/win32/po/ak/vidalia_ak.po | 2 +- pkg/win32/po/am/vidalia_am.po | 2 +- pkg/win32/po/ar/vidalia_ar.po | 2 +- pkg/win32/po/arn/vidalia_arn.po | 2 +- pkg/win32/po/ast/vidalia_ast.po | 2 +- pkg/win32/po/az/vidalia_az.po | 2 +- pkg/win32/po/bg/vidalia_bg.po | 2 +- pkg/win32/po/bn_IN/vidalia_bn_IN.po | 2 +- pkg/win32/po/ca/vidalia_ca.po | 2 +- pkg/win32/po/cs/vidalia_cs.po | 2 +- pkg/win32/po/csb/vidalia_csb.po | 2 +- pkg/win32/po/de/vidalia_de.po | 2 +- pkg/win32/po/de_CH/vidalia_de_CH.po | 2 +- pkg/win32/po/dz/vidalia_dz.po | 2 +- pkg/win32/po/eo/vidalia_eo.po | 2 +- pkg/win32/po/es/vidalia_es.po | 2 +- pkg/win32/po/et/vidalia_et.po | 2 +- pkg/win32/po/eu/vidalia_eu.po | 2 +- pkg/win32/po/fil/vidalia_fil.po | 2 +- pkg/win32/po/fur/vidalia_fur.po | 2 +- pkg/win32/po/ga/vidalia_ga.po | 2 +- pkg/win32/po/gl/vidalia_gl.po | 2 +- pkg/win32/po/gu/vidalia_gu.po | 2 +- pkg/win32/po/gun/vidalia_gun.po | 2 +- pkg/win32/po/ha/vidalia_ha.po | 2 +- pkg/win32/po/he/vidalia_he.po | 2 +- pkg/win32/po/hi/vidalia_hi.po | 2 +- pkg/win32/po/hr/vidalia_hr.po | 2 +- pkg/win32/po/ht/vidalia_ht.po | 2 +- pkg/win32/po/hu/vidalia_hu.po | 2 +- pkg/win32/po/id/vidalia_id.po | 2 +- pkg/win32/po/is/vidalia_is.po | 2 +- pkg/win32/po/it/vidalia_it.po | 2 +- pkg/win32/po/kn/vidalia_kn.po | 2 +- pkg/win32/po/lb/vidalia_lb.po | 2 +- pkg/win32/po/ln/vidalia_ln.po | 2 +- pkg/win32/po/lo/vidalia_lo.po | 2 +- pkg/win32/po/lt/vidalia_lt.po | 2 +- pkg/win32/po/lv/vidalia_lv.po | 2 +- pkg/win32/po/mg/vidalia_mg.po | 2 +- pkg/win32/po/mi/vidalia_mi.po | 2 +- pkg/win32/po/mk/vidalia_mk.po | 2 +- pkg/win32/po/ml/vidalia_ml.po | 2 +- pkg/win32/po/mn/vidalia_mn.po | 2 +- pkg/win32/po/mr/vidalia_mr.po | 2 +- pkg/win32/po/ms/vidalia_ms.po | 2 +- pkg/win32/po/mt/vidalia_mt.po | 2 +- pkg/win32/po/my/vidalia_my.po | 2 +- pkg/win32/po/nah/vidalia_nah.po | 2 +- pkg/win32/po/nap/vidalia_nap.po | 2 +- pkg/win32/po/nb/vidalia_nb.po | 2 +- pkg/win32/po/ne/vidalia_ne.po | 2 +- pkg/win32/po/nl/vidalia_nl.po | 2 +- pkg/win32/po/nn/vidalia_nn.po | 2 +- pkg/win32/po/nso/vidalia_nso.po | 2 +- pkg/win32/po/oc/vidalia_oc.po | 2 +- pkg/win32/po/pa/vidalia_pa.po | 2 +- pkg/win32/po/pap/vidalia_pap.po | 2 +- pkg/win32/po/pl/vidalia_pl.po | 2 +- pkg/win32/po/pms/vidalia_pms.po | 2 +- pkg/win32/po/ps/vidalia_ps.po | 2 +- pkg/win32/po/pt/vidalia_pt.po | 2 +- pkg/win32/po/pt_BR/vidalia_pt_BR.po | 2 +- pkg/win32/po/sco/vidalia_sco.po | 2 +- pkg/win32/po/son/vidalia_son.po | 2 +- pkg/win32/po/su/vidalia_su.po | 2 +- pkg/win32/po/sw/vidalia_sw.po | 2 +- pkg/win32/po/ta/vidalia_ta.po | 2 +- pkg/win32/po/te/vidalia_te.po | 2 +- pkg/win32/po/tg/vidalia_tg.po | 2 +- pkg/win32/po/th/vidalia_th.po | 2 +- pkg/win32/po/ti/vidalia_ti.po | 2 +- pkg/win32/po/tk/vidalia_tk.po | 2 +- pkg/win32/po/tr/vidalia_tr.po | 2 +- pkg/win32/po/ur/vidalia_ur.po | 2 +- pkg/win32/po/ve/vidalia_ve.po | 2 +- pkg/win32/po/vi/vidalia_vi.po | 2 +- pkg/win32/po/zh_CN/vidalia_zh_CN.po | 2 +- pkg/win32/po/zh_HK/vidalia_zh_HK.po | 2 +- pkg/win32/po/zu/vidalia_zu.po | 2 +- src/vidalia/help/content/po/af/netview.po | 2 +- src/vidalia/help/content/po/ak/netview.po | 2 +- src/vidalia/help/content/po/am/netview.po | 2 +- src/vidalia/help/content/po/ar/netview.po | 2 +- src/vidalia/help/content/po/arn/netview.po | 2 +- src/vidalia/help/content/po/ast/netview.po | 2 +- src/vidalia/help/content/po/az/netview.po | 2 +- src/vidalia/help/content/po/be/netview.po | 2 +- src/vidalia/help/content/po/bg/netview.po | 2 +- src/vidalia/help/content/po/bn/netview.po | 2 +- src/vidalia/help/content/po/bn_IN/netview.po | 2 +- src/vidalia/help/content/po/ca/netview.po | 2 +- src/vidalia/help/content/po/cs/netview.po | 2 +- src/vidalia/help/content/po/csb/netview.po | 2 +- src/vidalia/help/content/po/dz/netview.po | 2 +- src/vidalia/help/content/po/el/netview.po | 2 +- src/vidalia/help/content/po/eo/netview.po | 2 +- src/vidalia/help/content/po/es/netview.po | 2 +- src/vidalia/help/content/po/et/netview.po | 2 +- src/vidalia/help/content/po/eu/netview.po | 2 +- src/vidalia/help/content/po/fil/netview.po | 2 +- src/vidalia/help/content/po/fr/netview.po | 2 +- src/vidalia/help/content/po/fur/netview.po | 2 +- src/vidalia/help/content/po/ga/netview.po | 2 +- src/vidalia/help/content/po/gl/netview.po | 2 +- src/vidalia/help/content/po/gu/netview.po | 2 +- src/vidalia/help/content/po/gun/netview.po | 2 +- src/vidalia/help/content/po/ha/netview.po | 2 +- src/vidalia/help/content/po/he/netview.po | 2 +- src/vidalia/help/content/po/hi/netview.po | 2 +- src/vidalia/help/content/po/hr/netview.po | 2 +- src/vidalia/help/content/po/ht/netview.po | 2 +- src/vidalia/help/content/po/hu/netview.po | 2 +- src/vidalia/help/content/po/id/netview.po | 2 +- src/vidalia/help/content/po/is/netview.po | 2 +- src/vidalia/help/content/po/it/netview.po | 2 +- src/vidalia/help/content/po/kn/netview.po | 2 +- src/vidalia/help/content/po/kw/netview.po | 2 +- src/vidalia/help/content/po/lb/netview.po | 2 +- src/vidalia/help/content/po/ln/netview.po | 2 +- src/vidalia/help/content/po/lo/netview.po | 2 +- src/vidalia/help/content/po/lt/netview.po | 2 +- src/vidalia/help/content/po/lv/netview.po | 2 +- src/vidalia/help/content/po/mg/netview.po | 2 +- src/vidalia/help/content/po/mi/netview.po | 2 +- src/vidalia/help/content/po/mk/netview.po | 2 +- src/vidalia/help/content/po/ml/netview.po | 2 +- src/vidalia/help/content/po/mn/netview.po | 2 +- src/vidalia/help/content/po/mr/netview.po | 2 +- src/vidalia/help/content/po/ms/netview.po | 2 +- src/vidalia/help/content/po/mt/netview.po | 2 +- src/vidalia/help/content/po/my/netview.po | 2 +- src/vidalia/help/content/po/nap/netview.po | 2 +- src/vidalia/help/content/po/nb/netview.po | 2 +- src/vidalia/help/content/po/ne/netview.po | 2 +- src/vidalia/help/content/po/nl/netview.po | 2 +- src/vidalia/help/content/po/nn/netview.po | 2 +- src/vidalia/help/content/po/nso/netview.po | 2 +- src/vidalia/help/content/po/oc/netview.po | 2 +- src/vidalia/help/content/po/pa/netview.po | 2 +- src/vidalia/help/content/po/pap/netview.po | 2 +- src/vidalia/help/content/po/pl/netview.po | 2 +- src/vidalia/help/content/po/pms/netview.po | 2 +- src/vidalia/help/content/po/ps/netview.po | 2 +- src/vidalia/help/content/po/pt/netview.po | 2 +- src/vidalia/help/content/po/pt_BR/netview.po | 2 +- src/vidalia/help/content/po/ro/netview.po | 2 +- src/vidalia/help/content/po/ru/netview.po | 2 +- src/vidalia/help/content/po/sco/netview.po | 2 +- src/vidalia/help/content/po/son/netview.po | 2 +- src/vidalia/help/content/po/su/netview.po | 2 +- src/vidalia/help/content/po/sw/netview.po | 2 +- src/vidalia/help/content/po/ta/netview.po | 2 +- src/vidalia/help/content/po/te/netview.po | 2 +- src/vidalia/help/content/po/tg/netview.po | 2 +- src/vidalia/help/content/po/th/netview.po | 2 +- src/vidalia/help/content/po/ti/netview.po | 2 +- src/vidalia/help/content/po/tk/netview.po | 2 +- src/vidalia/help/content/po/tr/netview.po | 2 +- src/vidalia/help/content/po/uk/netview.po | 2 +- src/vidalia/help/content/po/ur/netview.po | 2 +- src/vidalia/help/content/po/ve/netview.po | 2 +- src/vidalia/help/content/po/vi/netview.po | 2 +- src/vidalia/help/content/po/wa/netview.po | 2 +- src/vidalia/help/content/po/zh_CN/netview.po | 2 +- src/vidalia/help/content/po/zh_HK/netview.po | 2 +- src/vidalia/help/content/po/zh_TW/netview.po | 2 +- src/vidalia/help/content/po/zu/netview.po | 2 +- src/vidalia/i18n/po/af/vidalia_af.po | 2 +- src/vidalia/i18n/po/ak/vidalia_ak.po | 2 +- src/vidalia/i18n/po/am/vidalia_am.po | 2 +- src/vidalia/i18n/po/ar/vidalia_ar.po | 4 +- src/vidalia/i18n/po/arn/vidalia_arn.po | 2 +- src/vidalia/i18n/po/ast/vidalia_ast.po | 2 +- src/vidalia/i18n/po/az/vidalia_az.po | 2 +- src/vidalia/i18n/po/bg/vidalia_bg.po | 2 +- src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po | 2 +- src/vidalia/i18n/po/ca/vidalia_ca.po | 2 +- src/vidalia/i18n/po/cs/vidalia_cs.po | 4 +- src/vidalia/i18n/po/csb/vidalia_csb.po | 2 +- src/vidalia/i18n/po/cy/vidalia_cy.po | 2 +- src/vidalia/i18n/po/de/vidalia_de.po | 6 +- src/vidalia/i18n/po/de_CH/vidalia_de_CH.po | 2 +- src/vidalia/i18n/po/dz/vidalia_dz.po | 2 +- src/vidalia/i18n/po/el/vidalia_el.po | 29 +- src/vidalia/i18n/po/eo/vidalia_eo.po | 4 +- src/vidalia/i18n/po/es/vidalia_es.po | 111 ++- src/vidalia/i18n/po/et/vidalia_et.po | 2 +- src/vidalia/i18n/po/eu/vidalia_eu.po | 2 +- src/vidalia/i18n/po/fil/vidalia_fil.po | 2 +- src/vidalia/i18n/po/fur/vidalia_fur.po | 2 +- src/vidalia/i18n/po/ga/vidalia_ga.po | 2 +- src/vidalia/i18n/po/gl/vidalia_gl.po | 2 +- src/vidalia/i18n/po/gu/vidalia_gu.po | 2 +- src/vidalia/i18n/po/gun/vidalia_gun.po | 2 +- src/vidalia/i18n/po/ha/vidalia_ha.po | 2 +- src/vidalia/i18n/po/he/vidalia_he.po | 4 +- src/vidalia/i18n/po/hi/vidalia_hi.po | 2 +- src/vidalia/i18n/po/hr/vidalia_hr.po | 2 +- src/vidalia/i18n/po/ht/vidalia_ht.po | 2 +- src/vidalia/i18n/po/hu/vidalia_hu.po | 1051 ++++++++++--------- src/vidalia/i18n/po/id/vidalia_id.po | 1459 ++++++++++++++----------- src/vidalia/i18n/po/is/vidalia_is.po | 2 +- src/vidalia/i18n/po/it/vidalia_it.po | 4 +- src/vidalia/i18n/po/kn/vidalia_kn.po | 2 +- src/vidalia/i18n/po/lb/vidalia_lb.po | 2 +- src/vidalia/i18n/po/ln/vidalia_ln.po | 2 +- src/vidalia/i18n/po/lo/vidalia_lo.po | 2 +- src/vidalia/i18n/po/lt/vidalia_lt.po | 2 +- src/vidalia/i18n/po/lv/vidalia_lv.po | 2 +- src/vidalia/i18n/po/mg/vidalia_mg.po | 2 +- src/vidalia/i18n/po/mi/vidalia_mi.po | 2 +- src/vidalia/i18n/po/mk/vidalia_mk.po | 2 +- src/vidalia/i18n/po/ml/vidalia_ml.po | 2 +- src/vidalia/i18n/po/mn/vidalia_mn.po | 2 +- src/vidalia/i18n/po/mr/vidalia_mr.po | 2 +- src/vidalia/i18n/po/ms/vidalia_ms.po | 2 +- src/vidalia/i18n/po/mt/vidalia_mt.po | 2 +- src/vidalia/i18n/po/my/vidalia_my.po | 4 +- src/vidalia/i18n/po/nah/vidalia_nah.po | 2 +- src/vidalia/i18n/po/nap/vidalia_nap.po | 2 +- src/vidalia/i18n/po/nb/vidalia_nb.po | 4 +- src/vidalia/i18n/po/ne/vidalia_ne.po | 2 +- src/vidalia/i18n/po/nl/vidalia_nl.po | 489 ++++++--- src/vidalia/i18n/po/nn/vidalia_nn.po | 2 +- src/vidalia/i18n/po/nso/vidalia_nso.po | 2 +- src/vidalia/i18n/po/oc/vidalia_oc.po | 2 +- src/vidalia/i18n/po/pa/vidalia_pa.po | 2 +- src/vidalia/i18n/po/pap/vidalia_pap.po | 2 +- src/vidalia/i18n/po/pl/vidalia_pl.po | 4 +- src/vidalia/i18n/po/pms/vidalia_pms.po | 2 +- src/vidalia/i18n/po/ps/vidalia_ps.po | 2 +- src/vidalia/i18n/po/pt/vidalia_pt.po | 4 +- src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po | 4 +- src/vidalia/i18n/po/ru/vidalia_ru.po | 2 +- src/vidalia/i18n/po/sco/vidalia_sco.po | 2 +- src/vidalia/i18n/po/son/vidalia_son.po | 2 +- src/vidalia/i18n/po/su/vidalia_su.po | 2 +- src/vidalia/i18n/po/sw/vidalia_sw.po | 2 +- src/vidalia/i18n/po/ta/vidalia_ta.po | 2 +- src/vidalia/i18n/po/te/vidalia_te.po | 2 +- src/vidalia/i18n/po/tg/vidalia_tg.po | 2 +- src/vidalia/i18n/po/th/vidalia_th.po | 4 +- src/vidalia/i18n/po/ti/vidalia_ti.po | 2 +- src/vidalia/i18n/po/tk/vidalia_tk.po | 2 +- src/vidalia/i18n/po/tr/vidalia_tr.po | 4 +- src/vidalia/i18n/po/ur/vidalia_ur.po | 2 +- src/vidalia/i18n/po/ve/vidalia_ve.po | 2 +- src/vidalia/i18n/po/vi/vidalia_vi.po | 4 +- src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po | 4 +- src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po | 2 +- src/vidalia/i18n/po/zu/vidalia_zu.po | 2 +- 253 files changed, 2041 insertions(+), 1626 deletions(-)

1 0

[vidalia/master] Log the used ports when auto is on
by chiiph＠torproject.org 13 Aug '11

13 Aug '11

commit 8e0ca7188a91091d5ef6c75ed480f99cab2bf397 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Wed Aug 10 10:01:27 2011 -0300 Log the used ports when auto is on --- src/vidalia/MainWindow.cpp | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 5634e63..c878fd1 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -2030,6 +2030,13 @@ MainWindow::updateBrowserEnv() { env << QString("TOR_SOCKS_HOST=%1").arg(addr.toString()); env << QString("TOR_SOCKS_PORT=%1").arg(port); + + vInfo(QString("Using automatic ControlPort and SocksPort configuration:\n" + " ControlPort=%1\n SocksPort=%2\n Host=%3\n Configuration file:%4") + .arg(_autoControlPort) + .arg(port) + .arg(addrPort.at(0)) + .arg(QString("%1/port.conf").arg(expand_filename(settings.getDataDirectory())))); } if(settings.getAuthenticationMethod() == TorSettings::PasswordAuth) {

1 0