March 2012 - tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 28 Mar '12

28 Mar '12

commit c9818d52fb1c2bf51d560e697be44efa4f2ea3a0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 22:45:19 2012 +0000 Update translations for vidalia_help --- fa/bridges.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fa/bridges.po b/fa/bridges.po index e60de6e..4d0840f 100644 --- a/fa/bridges.po +++ b/fa/bridges.po @@ -2,13 +2,14 @@ # Translators: # <aalaeiarash(a)gmail.com>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. +# <s.sampad(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2012-02-14 10:02+0000\n" -"Last-Translator: arashaalaei <aalaeiarash(a)gmail.com>\n" +"PO-Revision-Date: 2012-03-28 22:39+0000\n" +"Last-Translator: ssampad <s.sampad(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgstr "پل های انتقالی" #. type: Content of: <html><body> #: en/bridges.html:19 msgid "<a name=\"about\"/>" -msgstr "یک نام = درباره" +msgstr "<a name=\"درباره\"/>" #. type: Content of: <html><body><h3> #: en/bridges.html:20

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 28 Mar '12

28 Mar '12

commit 1dc999b541d1a9155686d3b86d8443fd245d18c4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 22:45:09 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index be114e6..4263ed2 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-03-28 22:11+0000\n" +"PO-Revision-Date: 2012-03-28 22:24+0000\n" "Last-Translator: ssampad <s.sampad(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2122,14 +2122,14 @@ msgid "" "\n" "Here's the last error message:\n" "%2" -msgstr "Vidalia نمی تواند راهی برای برقراری ارتباط با Tor پیدا کند زیرا به فایل: %1 دسترسی ندارد.\n\nآخرین پیغام خطا:\n%2" +msgstr "\"ویدالیا\" نمی تواند راهی برای برقراری ارتباط با \"تُر\" پیدا کند زیرا به فایل: %1 دسترسی ندارد.\n\nآخرین پیغام خطا:\n%2" msgctxt "MainWindow" msgid "" "It seems Tor has stopped running since Vidalia started it.\n" "\n" "See the Advanced Message Log for more information." -msgstr "" +msgstr "به نظر می رسد که \"تُر\" پس از اجرا شدن توسط Vidalia متوقف شده است.\n\nبرای کسب اطلاعات بیشتر می توانید قسمت گزارش پیام پیشرفته را مشاهده نمایید." msgctxt "MainWindow" msgid "" @@ -3122,7 +3122,7 @@ msgstr "(ترافیک باز پخش برای شبکه تُر (بازپخش خر msgctxt "ServerPage" msgid "Relay traffic inside the Tor network (non-exit relay)" -msgstr "باز پخش ترافیک درون شبکه Tor (بازپخش غیر خروجی)" +msgstr "باز پخش ترافیک درون شبکه \"تُر\" (بازپخش داخلی)" msgctxt "ServerPage" msgid "Mirror the Relay Directory"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 28 Mar '12

28 Mar '12

commit d1f759b6d4b65f13c62d81533bc5c0e343d3f11f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 22:15:08 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 6c26dc7..be114e6 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -5,13 +5,14 @@ # martin luther king <sabztunnel(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. # <slander_mo(a)hotmail.com>, 2012. +# <s.sampad(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-03-25 08:42+0000\n" -"Last-Translator: ms2222 <slander_mo(a)hotmail.com>\n" +"PO-Revision-Date: 2012-03-28 22:11+0000\n" +"Last-Translator: ssampad <s.sampad(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2121,7 +2122,7 @@ msgid "" "\n" "Here's the last error message:\n" "%2" -msgstr "" +msgstr "Vidalia نمی تواند راهی برای برقراری ارتباط با Tor پیدا کند زیرا به فایل: %1 دسترسی ندارد.\n\nآخرین پیغام خطا:\n%2" msgctxt "MainWindow" msgid "" @@ -3121,7 +3122,7 @@ msgstr "(ترافیک باز پخش برای شبکه تُر (بازپخش خر msgctxt "ServerPage" msgid "Relay traffic inside the Tor network (non-exit relay)" -msgstr "" +msgstr "باز پخش ترافیک درون شبکه Tor (بازپخش غیر خروجی)" msgctxt "ServerPage" msgid "Mirror the Relay Directory"

1 0

r25582: {website} we don't translate the website anymore (website/trunk/getinvolved/en)
by Roger Dingledine 28 Mar '12

28 Mar '12

Author: arma Date: 2012-03-28 22:08:45 +0000 (Wed, 28 Mar 2012) New Revision: 25582 Modified: website/trunk/getinvolved/en/translation.wml Log: we don't translate the website anymore Modified: website/trunk/getinvolved/en/translation.wml =================================================================== --- website/trunk/getinvolved/en/translation.wml 2012-03-27 23:08:04 UTC (rev 25581) +++ website/trunk/getinvolved/en/translation.wml 2012-03-28 22:08:45 UTC (rev 25582) @@ -2,7 +2,7 @@ # Revision: $Revision$ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor Website Translation Guidelines" CHARSET="UTF-8" +#include "head.wmi" TITLE="Tor Translation Guidelines" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> @@ -10,11 +10,11 @@ <a href="<page getinvolved/translation>">Translation Guidelines</a> </div> <div id="maincol"> - <h1>Tor Website Translation Guidelines</h1> + <h1>Tor Translation Guidelines</h1> <hr> <p> - If you want to help translate the Tor website and documentation into + If you want to help translate the Tor tools and documentation into other languages, here are some guidelines to help you do this as efficiently as possible. </p>

1 0

[obfsproxy/master] Don't set bufferevent callbacks before forming the circuit.
by asn＠torproject.org 28 Mar '12

28 Mar '12

commit 4b754df88f8d658b4731ce93f2fcafcc34b72244 Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Mar 17 16:01:22 2012 -0700 Don't set bufferevent callbacks before forming the circuit. Achieve that by splitting the circuit creation into three parts: First, create the connection on the other side of the circuit. Then, build the circuit. Finally, set up bufferevent callbacks. Conflicts: src/network.c --- src/network.c | 151 +++++++++++++++++++++++++++------------------------------ 1 files changed, 72 insertions(+), 79 deletions(-) diff --git a/src/network.c b/src/network.c index e42b195..219593f 100644 --- a/src/network.c +++ b/src/network.c @@ -150,7 +150,6 @@ static void conn_free_on_flush(struct bufferevent *bev, void *arg); static void circuit_create_socks(conn_t *up); static int circuit_add_down(circuit_t *circuit, conn_t *down); static void circuit_free(circuit_t *circuit); -static conn_t *open_outbound(conn_t *conn, bufferevent_data_cb readcb); static void upstream_read_cb(struct bufferevent *bev, void *arg); static void downstream_read_cb(struct bufferevent *bev, void *arg); @@ -339,48 +338,63 @@ static int conn_connect(conn_t *addr_conn, conn_t *connect_conn, bufferevent_data_cb readcb) { - bufferevent_setcb(buf, readcb, NULL, pending_conn_cb, newconn); + char *peername; + struct evutil_addrinfo *addr = config_get_target_addr(addr_conn->cfg); + struct bufferevent *buf = connect_conn->buffer; + + if (!addr) { + log_warn("%s: no target addresses available", safe_str(addr_conn->peername)); + return -1; + } + + bufferevent_setcb(buf, readcb, NULL, pending_conn_cb, connect_conn); do { peername = printable_address(addr->ai_addr, addr->ai_addrlen); + if (bufferevent_socket_connect(buf, addr->ai_addr, addr->ai_addrlen) >= 0) goto success; log_info("%s: connection to %s failed: %s", - safe_str(conn->peername), safe_str(peername), + safe_str(addr_conn->peername), safe_str(peername), evutil_socket_error_to_string(EVUTIL_SOCKET_ERROR())); free(peername); addr = addr->ai_next; } while (addr); log_warn("%s: all outbound connection attempts failed", - conn->peername); + addr_conn->peername); - conn_free(newconn); - return NULL; + return -1; success: log_info("%s (%s): Successful outbound connection to '%s'.", - safe_str(conn->peername), conn->cfg->vtable->name, safe_str(peername)); + safe_str(addr_conn->peername), + addr_conn->cfg->vtable->name, safe_str(peername)); bufferevent_enable(buf, EV_READ|EV_WRITE); - newconn->peername = peername; - obfs_assert(connections); - smartlist_add(connections, newconn); + connect_conn->peername = peername; /* If we are a server, we should note this connection and consider it in our heartbeat status messages. */ - if (conn->mode == LSN_SIMPLE_SERVER) - status_note_connection(conn->peername); + if (addr_conn->mode == LSN_SIMPLE_SERVER) + status_note_connection(addr_conn->peername); + + return 0; } /** Create the other side of connection <b>conn</b> on a circuit. */ static conn_t * create_other_side_of_conn(const conn_t *conn) { + struct event_base *base = bufferevent_get_base(conn->buffer); + struct bufferevent *buf; + conn_t *newconn; + buf = bufferevent_socket_new(base, -1, BEV_OPT_CLOSE_ON_FREE); if (!buf) { log_warn("%s: unable to create outbound socket buffer", safe_str(conn->peername)); return NULL; } + newconn = proto_conn_create(conn->cfg); if (!newconn) { log_warn("%s: failed to allocate state for outbound connection", @@ -391,6 +405,11 @@ create_other_side_of_conn(const conn_t *conn) /* associate bufferevent with the new connection. */ newconn->buffer = buf; + + obfs_assert(connections); + smartlist_add(connections, newconn); + + return newconn; } /** @@ -406,11 +425,22 @@ simple_client_listener_cb(conn_t *conn) bufferevent_setcb(conn->buffer, upstream_read_cb, NULL, error_cb, conn); - if (circuit_create(conn, open_outbound(conn, downstream_read_cb))) { + conn_t *newconn = create_other_side_of_conn(conn); + if (!newconn) { + conn_free(conn); + return; + } + + if (circuit_create(conn, newconn)) { conn_free(conn); return; } + if (conn_connect(conn, newconn, downstream_read_cb) < 0) { + conn_free(conn); /* circuit_free() should also free newconn. */ + return; + } + log_debug("%s: setup complete", safe_str(conn->peername)); } @@ -449,7 +479,18 @@ simple_server_listener_cb(conn_t *conn) bufferevent_setcb(conn->buffer, downstream_read_cb, NULL, error_cb, conn); - if (circuit_create(open_outbound(conn, upstream_read_cb), conn)) { + conn_t *newconn = create_other_side_of_conn(conn); + if (!newconn) { + conn_free(conn); + return; + } + + if (circuit_create(newconn, conn)) { + conn_free(conn); + return; + } + + if (conn_connect(conn, newconn, upstream_read_cb) < 0) { conn_free(conn); return; } @@ -560,61 +601,6 @@ circuit_free(circuit_t *circuit) } /** - Make the outbound connection for a circuit. -*/ -static conn_t * -open_outbound(conn_t *conn, bufferevent_data_cb readcb) -{ - struct evutil_addrinfo *addr = config_get_target_addr(conn->cfg); - struct event_base *base = bufferevent_get_base(conn->buffer); - struct bufferevent *buf; - char *peername; - conn_t *newconn; - - if (!addr) { - log_warn("%s: no target addresses available", safe_str(conn->peername)); - return NULL; - } - - buf = bufferevent_socket_new(base, -1, BEV_OPT_CLOSE_ON_FREE); - if (!buf) { - log_warn("%s: unable to create outbound socket buffer", safe_str(conn->peername)); - return NULL; - } - - newconn = proto_conn_create(conn->cfg); - if (!newconn) { - log_warn("%s: failed to allocate state for outbound connection", - safe_str(conn->peername)); - bufferevent_free(buf); - return NULL; - } - - newconn->buffer = buf; - - return newconn; -} - -/** - As open_outbound, but uses bufferevent_socket_connect_hostname - rather than bufferevent_socket_connect. -*/ -static conn_t * -open_outbound_hostname(conn_t *conn, int af, const char *addr, uint16_t port) -{ - struct event_base *base = bufferevent_get_base(conn->buffer); - struct bufferevent *buf; - conn_t *newconn; - - /* Set up a temporary FQDN peername. When we actually connect to the - host, we will replace this peername with the IP address we - connected to. */ - obfs_asprintf(&newconn->peername, "%s:%u", addr, port); - - return newconn; -} - -/** This callback is responsible for handling SOCKS traffic. */ static void @@ -644,26 +630,33 @@ socks_read_cb(struct bufferevent *bev, void *arg) log_info("%s: socks: trying to connect to %s:%u", safe_str(conn->peername), safe_str(addr), port); - if (circuit_add_down(conn->circuit, - open_outbound_hostname(conn, af, addr, port))) { + conn_t *newconn = create_other_side_of_conn(conn); + if (!newconn) { + conn_free(conn); + return; + } + + /* Set up a temporary FQDN peername. When we actually connect to the + host, we will replace this peername with the IP address we + connected to. */ + obfs_asprintf(&newconn->peername, "%s:%u", addr, port); + + if (circuit_add_down(conn->circuit, newconn)) { /* XXXX send socks reply */ conn_free(conn); return; } - bufferevent_setcb(buf, downstream_read_cb, NULL, pending_socks_cb, newconn); - if (bufferevent_socket_connect_hostname(buf, get_evdns_base(), + bufferevent_setcb(newconn->buffer, downstream_read_cb, NULL, pending_socks_cb, newconn); + if (bufferevent_socket_connect_hostname(newconn->buffer, get_evdns_base(), af, addr, port) < 0) { log_warn("%s: outbound connection to %s:%u failed: %s", safe_str(conn->peername), addr, port, evutil_socket_error_to_string(EVUTIL_SOCKET_ERROR())); - conn_free(newconn); - return NULL; + conn_free(conn); + return; } - - bufferevent_enable(buf, EV_READ|EV_WRITE); - obfs_assert(connections); - smartlist_add(connections, newconn); + bufferevent_enable(newconn->buffer, EV_READ|EV_WRITE); /* further upstream data will be processed once the downstream side is established */

1 0

[obfsproxy/master] Move connection-building code around.
by asn＠torproject.org 28 Mar '12

28 Mar '12

commit 292b9ac875a44966d74c89cf6f2deac18310f2e5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Mar 19 16:48:10 2012 -0700 Move connection-building code around. In open_outbound{,_hostname}(), move the connection building part to a new function called conn_connect(). Then move the connection creation part of those functions, to create_other_side_of_conn(). --- src/network.c | 137 ++++++++++++++++++++++++++++++++------------------------- 1 files changed, 77 insertions(+), 60 deletions(-) diff --git a/src/network.c b/src/network.c index 968bdf4..e42b195 100644 --- a/src/network.c +++ b/src/network.c @@ -331,6 +331,68 @@ listener_cb(struct evconnlistener *evcl, evutil_socket_t fd, } } +/** Given a connection <b>addr_conn</b> carrying addresses that we + should connect to, use <b>connect_conn</b> to connect to + them. Also, set the callbacks of the connecting bufferevent, with + <b>readcb</b> being the read callback. */ +static int +conn_connect(conn_t *addr_conn, conn_t *connect_conn, + bufferevent_data_cb readcb) +{ + bufferevent_setcb(buf, readcb, NULL, pending_conn_cb, newconn); + + do { + peername = printable_address(addr->ai_addr, addr->ai_addrlen); + if (bufferevent_socket_connect(buf, addr->ai_addr, addr->ai_addrlen) >= 0) + goto success; + log_info("%s: connection to %s failed: %s", + safe_str(conn->peername), safe_str(peername), + evutil_socket_error_to_string(EVUTIL_SOCKET_ERROR())); + free(peername); + addr = addr->ai_next; + } while (addr); + + log_warn("%s: all outbound connection attempts failed", + conn->peername); + + conn_free(newconn); + return NULL; + + success: + log_info("%s (%s): Successful outbound connection to '%s'.", + safe_str(conn->peername), conn->cfg->vtable->name, safe_str(peername)); + bufferevent_enable(buf, EV_READ|EV_WRITE); + newconn->peername = peername; + obfs_assert(connections); + smartlist_add(connections, newconn); + + /* If we are a server, we should note this connection and consider + it in our heartbeat status messages. */ + if (conn->mode == LSN_SIMPLE_SERVER) + status_note_connection(conn->peername); +} + +/** Create the other side of connection <b>conn</b> on a circuit. */ +static conn_t * +create_other_side_of_conn(const conn_t *conn) +{ + buf = bufferevent_socket_new(base, -1, BEV_OPT_CLOSE_ON_FREE); + if (!buf) { + log_warn("%s: unable to create outbound socket buffer", safe_str(conn->peername)); + return NULL; + } + newconn = proto_conn_create(conn->cfg); + if (!newconn) { + log_warn("%s: failed to allocate state for outbound connection", + safe_str(conn->peername)); + bufferevent_free(buf); + return NULL; + } + + /* associate bufferevent with the new connection. */ + newconn->buffer = buf; +} + /** This function is called when an upstream client connects to us in simple client mode. @@ -529,37 +591,6 @@ open_outbound(conn_t *conn, bufferevent_data_cb readcb) } newconn->buffer = buf; - bufferevent_setcb(buf, readcb, NULL, pending_conn_cb, newconn); - - do { - peername = printable_address(addr->ai_addr, addr->ai_addrlen); - if (bufferevent_socket_connect(buf, addr->ai_addr, addr->ai_addrlen) >= 0) - goto success; - log_info("%s: connection to %s failed: %s", - safe_str(conn->peername), safe_str(peername), - evutil_socket_error_to_string(EVUTIL_SOCKET_ERROR())); - free(peername); - addr = addr->ai_next; - } while (addr); - - log_warn("%s: all outbound connection attempts failed", - conn->peername); - - conn_free(newconn); - return NULL; - - success: - log_info("%s (%s): Successful outbound connection to '%s'.", - safe_str(conn->peername), conn->cfg->vtable->name, safe_str(peername)); - bufferevent_enable(buf, EV_READ|EV_WRITE); - newconn->peername = peername; - obfs_assert(connections); - smartlist_add(connections, newconn); - - /* If we are a server, we should note this connection and consider - it in our heartbeat status messages. */ - if (conn->mode == LSN_SIMPLE_SERVER) - status_note_connection(conn->peername); return newconn; } @@ -575,40 +606,11 @@ open_outbound_hostname(conn_t *conn, int af, const char *addr, uint16_t port) struct bufferevent *buf; conn_t *newconn; - buf = bufferevent_socket_new(base, -1, BEV_OPT_CLOSE_ON_FREE); - if (!buf) { - log_warn("%s: unable to create outbound socket buffer", safe_str(conn->peername)); - return NULL; - } - newconn = proto_conn_create(conn->cfg); - if (!newconn) { - log_warn("%s: failed to allocate state for outbound connection", - safe_str(conn->peername)); - bufferevent_free(buf); - return NULL; - } - - /* associate bufferevent with the new connection. */ - newconn->buffer = buf; - /* Set up a temporary FQDN peername. When we actually connect to the host, we will replace this peername with the IP address we connected to. */ obfs_asprintf(&newconn->peername, "%s:%u", addr, port); - bufferevent_setcb(buf, downstream_read_cb, NULL, pending_socks_cb, newconn); - if (bufferevent_socket_connect_hostname(buf, get_evdns_base(), - af, addr, port) < 0) { - log_warn("%s: outbound connection to %s:%u failed: %s", - safe_str(conn->peername), addr, port, - evutil_socket_error_to_string(EVUTIL_SOCKET_ERROR())); - conn_free(newconn); - return NULL; - } - - bufferevent_enable(buf, EV_READ|EV_WRITE); - obfs_assert(connections); - smartlist_add(connections, newconn); return newconn; } @@ -648,6 +650,21 @@ socks_read_cb(struct bufferevent *bev, void *arg) conn_free(conn); return; } + + bufferevent_setcb(buf, downstream_read_cb, NULL, pending_socks_cb, newconn); + if (bufferevent_socket_connect_hostname(buf, get_evdns_base(), + af, addr, port) < 0) { + log_warn("%s: outbound connection to %s:%u failed: %s", + safe_str(conn->peername), addr, port, + evutil_socket_error_to_string(EVUTIL_SOCKET_ERROR())); + conn_free(newconn); + return NULL; + } + + bufferevent_enable(buf, EV_READ|EV_WRITE); + obfs_assert(connections); + smartlist_add(connections, newconn); + /* further upstream data will be processed once the downstream side is established */ bufferevent_disable(conn->buffer, EV_READ|EV_WRITE);

1 0

[obfsproxy/master] Don't poke connections or circuits after connect_hostname().
by asn＠torproject.org 28 Mar '12

28 Mar '12

commit 70e6947c81e7c0f42c94e837fdabec271b876567 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Mar 19 17:10:06 2012 -0700 Don't poke connections or circuits after connect_hostname(). bufferevent_socket_connect_hostname() might fail immediately, and take the whole circuit with it (since pending_socks_cb() and error_or_eof() will be called). This means that we should not play with conn_t or circuit_t after calling bufferevent_socket_connect_hostname(). --- src/network.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/network.c b/src/network.c index 219593f..1d73249 100644 --- a/src/network.c +++ b/src/network.c @@ -648,6 +648,12 @@ socks_read_cb(struct bufferevent *bev, void *arg) } bufferevent_setcb(newconn->buffer, downstream_read_cb, NULL, pending_socks_cb, newconn); + bufferevent_enable(newconn->buffer, EV_READ|EV_WRITE); + + /* further upstream data will be processed once the downstream + side is established */ + bufferevent_disable(conn->buffer, EV_READ|EV_WRITE); + if (bufferevent_socket_connect_hostname(newconn->buffer, get_evdns_base(), af, addr, port) < 0) { log_warn("%s: outbound connection to %s:%u failed: %s", @@ -656,11 +662,6 @@ socks_read_cb(struct bufferevent *bev, void *arg) conn_free(conn); return; } - bufferevent_enable(newconn->buffer, EV_READ|EV_WRITE); - - /* further upstream data will be processed once the downstream - side is established */ - bufferevent_disable(conn->buffer, EV_READ|EV_WRITE); return; }

1 0

[obfsproxy/master] Update changelog for #5156.
by asn＠torproject.org 28 Mar '12

28 Mar '12

commit fb132ee04e8480be31c3c17aba4ff9eb27821be0 Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Mar 17 16:29:33 2012 -0700 Update changelog for #5156. --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index f719d58..83fbd6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ Changes in version 0.1.2 - <not yet released> #5157. - Implement obfsproxy --version. Fixes the rest of bug #5157. - Implement obfsproxy --help. + - Fix assertion failure when obfsproxy starts without network + connectivity. Fixes bug #5156. Changes in version 0.1.1 - 2012-03-09

1 0

[tor/master] Move the logging of 'My line' to debug level (#5151).
by nickm＠torproject.org 28 Mar '12

28 Mar '12

commit 341e37e38c8b341097ed0fcd3d396dca00578f47 Author: Linus Nordberg <linus(a)nordberg.se> Date: Mon Mar 19 05:12:19 2012 +0100 Move the logging of 'My line' to debug level (#5151). --- src/or/router.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index d86c5f3..fa89e61 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1997,7 +1997,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, if (a) { tor_asprintf(&extra_or_address, "or-address %s:%d\n", a, router->ipv6_orport); - log_notice(LD_OR, "My line is <%s>", extra_or_address); + log_debug(LD_OR, "My or-address line is <%s>", extra_or_address); } }

1 0

[tor/master] Add changes file.
by nickm＠torproject.org 28 Mar '12

28 Mar '12

commit bd4d8fc744548a234bc35132abd07dcc25c7d51f Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Mar 27 15:00:34 2012 +0200 Add changes file. --- changes/bug5151 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug5151 b/changes/bug5151 new file mode 100644 index 0000000..f872aa4 --- /dev/null +++ b/changes/bug5151 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix bug stomping on ORPort option NoListen and ignoring option + NoAdvertise. Fixes bug 5151. + - Move a debug printout from notice to debug level.

1 0