- tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'rransom-tor/bug3465-022' into maint-0.2.2
by nickm＠torproject.org 05 Jul '11

05 Jul '11

commit 335ff915c7a509eb1b76e67f88c7b65d20032035 Merge: 06f0c1a 93d52f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 15:52:11 2011 -0400 Merge remote-tracking branch 'rransom-tor/bug3465-022' into maint-0.2.2 changes/bug3465-022 | 6 ++++++ src/or/circuitbuild.c | 10 +++++----- src/or/circuitlist.c | 2 +- src/or/control.c | 3 ++- 4 files changed, 14 insertions(+), 7 deletions(-)

1 0

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

05 Jul '11

commit 7295ad18d5c7ca67f6eee6d71823fc071103b795 Merge: 0be2934 335ff91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 16:01:12 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2'

1 0

[tor/maint-0.2.2] Fix minor comment issues
by nickm＠torproject.org 05 Jul '11

05 Jul '11

commit cb1b20dbad2ee346a814b30d5dc72a3dc93069e5 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 23 15:10:11 2011 -0700 Fix minor comment issues --- src/or/circuitbuild.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6d7e711..1140f33 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1501,7 +1501,7 @@ get_unique_circ_id_by_conn(or_connection_t *conn) } /** If <b>verbose</b> is false, allocate and return a comma-separated list of - * the currently built elements of circuit_t. If <b>verbose</b> is true, also + * the currently built elements of <b>circ</b>. If <b>verbose</b> is true, also * list information about link status in a more verbose format using spaces. * If <b>verbose_names</b> is false, give nicknames for Named routers and hex * digests for others; if <b>verbose_names</b> is true, use $DIGEST=Name style @@ -1590,7 +1590,7 @@ circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names) } /** If <b>verbose</b> is false, allocate and return a comma-separated - * list of the currently built elements of circuit_t. If + * list of the currently built elements of <b>circ</b>. If * <b>verbose</b> is true, also list information about link status in * a more verbose format using spaces. */ @@ -1601,7 +1601,7 @@ circuit_list_path(origin_circuit_t *circ, int verbose) } /** Allocate and return a comma-separated list of the currently built elements - * of circuit_t, giving each as a verbose nickname. + * of <b>circ</b>, giving each as a verbose nickname. */ char * circuit_list_path_for_controller(origin_circuit_t *circ) @@ -1610,7 +1610,7 @@ circuit_list_path_for_controller(origin_circuit_t *circ) } /** Log, at severity <b>severity</b>, the nicknames of each router in - * circ's cpath. Also log the length of the cpath, and the intended + * <b>circ</b>'s cpath. Also log the length of the cpath, and the intended * exit point. */ void @@ -1622,7 +1622,7 @@ circuit_log_path(int severity, unsigned int domain, origin_circuit_t *circ) } /** Tell the rep(utation)hist(ory) module about the status of the links - * in circ. Hops that have become OPEN are marked as successfully + * in <b>circ</b>. Hops that have become OPEN are marked as successfully * extended; the _first_ hop that isn't open (if any) is marked as * unable to extend. */

1 0

[tor/maint-0.2.2] Add BUILDTIMEOUT_SET to the result of GETINFO events/names
by nickm＠torproject.org 05 Jul '11

05 Jul '11

commit 93d52f6739d3bb184575aa53eab1562d2c80ee57 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Jun 25 15:02:11 2011 -0700 Add BUILDTIMEOUT_SET to the result of GETINFO events/names --- changes/bug3465-022 | 6 ++++++ src/or/control.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/changes/bug3465-022 b/changes/bug3465-022 new file mode 100644 index 0000000..2d22616 --- /dev/null +++ b/changes/bug3465-022 @@ -0,0 +1,6 @@ + o Minor bugfixes: + + - Add BUILDTIMEOUT_SET to the list returned by the 'GETINFO + events/names' control-port command. Bugfix on 0.2.2.9-alpha; + fixes part of bug 3465. + diff --git a/src/or/control.c b/src/or/control.c index 82017bd..da0a95d 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1380,7 +1380,8 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, *answer = tor_strdup("CIRC STREAM ORCONN BW DEBUG INFO NOTICE WARN ERR " "NEWDESC ADDRMAP AUTHDIR_NEWDESCS DESCCHANGED " "NS STATUS_GENERAL STATUS_CLIENT STATUS_SERVER " - "GUARD STREAM_BW CLIENTS_SEEN NEWCONSENSUS"); + "GUARD STREAM_BW CLIENTS_SEEN NEWCONSENSUS " + "BUILDTIMEOUT_SET"); } else if (!strcmp(question, "features/names")) { *answer = tor_strdup("VERBOSE_NAMES EXTENDED_EVENTS"); } else if (!strcmp(question, "address")) {

1 0

[tor/maint-0.2.2] Correct a comment
by nickm＠torproject.org 05 Jul '11

05 Jul '11

commit 53f87a89f00d075bdc81c2c468e844f3132ef953 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Jun 24 15:12:45 2011 -0700 Correct a comment --- src/or/circuitlist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 8534c38..e9cc9eb 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -866,7 +866,7 @@ circuit_unlink_all_from_or_conn(or_connection_t *conn, int reason) } /** Return a circ such that: - * - circ-\>rend_data-\>query is equal to <b>rend_query</b>, and + * - circ-\>rend_data-\>onion_address is equal to <b>rend_query</b>, and * - circ-\>purpose is equal to <b>purpose</b>. * * Return NULL if no such circuit exists.

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'rransom-tor/bug3465-022' into maint-0.2.2
by nickm＠torproject.org 05 Jul '11

05 Jul '11

commit 335ff915c7a509eb1b76e67f88c7b65d20032035 Merge: 06f0c1a 93d52f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 15:52:11 2011 -0400 Merge remote-tracking branch 'rransom-tor/bug3465-022' into maint-0.2.2 changes/bug3465-022 | 6 ++++++ src/or/circuitbuild.c | 10 +++++----- src/or/circuitlist.c | 2 +- src/or/control.c | 3 ++- 4 files changed, 14 insertions(+), 7 deletions(-)

1 0

r24862: {website} wrap the text bodies in paragraph tags. (website/trunk/about/en)
by Andrew Lewman 05 Jul '11

05 Jul '11

Author: phobos Date: 2011-07-05 14:57:24 +0000 (Tue, 05 Jul 2011) New Revision: 24862 Modified: website/trunk/about/en/contact.wml Log: wrap the text bodies in paragraph tags. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2011-07-05 14:54:49 UTC (rev 24861) +++ website/trunk/about/en/contact.wml 2011-07-05 14:57:24 UTC (rev 24862) @@ -38,14 +38,14 @@ </ul> <h3>Identi.ca</h3> - <a id="identica"></a> + <p><a id="identica"></a> Contact us via our microblogging Identi.ca account at <a - href="https://identi.ca/torproject">torproject</a>. + href="https://identi.ca/torproject">torproject</a>.</p> <h3>IRC</h3> <a id="irc"></a> - Tor users and developers can also be found in the following channels on <a - href="http://www.oftc.net/oftc/">OFTC</a>: + <p>Tor users and developers can also be found in the following channels on <a + href="http://www.oftc.net/oftc/">OFTC</a>:</p> <ul> <li><i>#tor</i> - User and relay operation discussions. Having trouble @@ -60,8 +60,9 @@ <h3>Telephone</h3> <a id="phone"></a> - If none of the above appeal to you, calling +1-781-352-0568 will reach - the Tor office. Should there be no answer, please leave a message. + <p>If none of the above appeal to you, calling +1-781-352-0568 + will reach the Tor office. Should there be no answer, please leave + a message.</p> </div>

1 0

r24861: {website} add headings and our identi.ca account. (website/trunk/about/en)
by Andrew Lewman 05 Jul '11

05 Jul '11

Author: phobos Date: 2011-07-05 14:54:49 +0000 (Tue, 05 Jul 2011) New Revision: 24861 Modified: website/trunk/about/en/contact.wml Log: add headings and our identi.ca account. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2011-07-05 08:14:09 UTC (rev 24860) +++ website/trunk/about/en/contact.wml 2011-07-05 14:54:49 UTC (rev 24861) @@ -13,6 +13,7 @@ <div id="maincol"> <h2>Tor: Contact</h2> + <h3>Email</h3> <a id="email"></a> <i>tor-assistants at torproject.org</i> is the catch-all address for everything. It can be used for reaching people working on Tor. @@ -36,6 +37,12 @@ certification, etc.</li> </ul> + <h3>Identi.ca</h3> + <a id="identica"></a> + Contact us via our microblogging Identi.ca account at <a + href="https://identi.ca/torproject">torproject</a>. + + <h3>IRC</h3> <a id="irc"></a> Tor users and developers can also be found in the following channels on <a href="http://www.oftc.net/oftc/">OFTC</a>: @@ -51,6 +58,7 @@ stuff that is not related to Tor.</li> </ul> + <h3>Telephone</h3> <a id="phone"></a> If none of the above appeal to you, calling +1-781-352-0568 will reach the Tor office. Should there be no answer, please leave a message.

1 0

r24860: {website} Fix minor typos (website/trunk/about/en)
by Robert Ransom 05 Jul '11

05 Jul '11

Author: rransom Date: 2011-07-05 08:14:09 +0000 (Tue, 05 Jul 2011) New Revision: 24860 Modified: website/trunk/about/en/contact.wml Log: Fix minor typos Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2011-07-05 02:30:53 UTC (rev 24859) +++ website/trunk/about/en/contact.wml 2011-07-05 08:14:09 UTC (rev 24860) @@ -38,14 +38,14 @@ <a id="irc"></a> Tor users and developers can also be found in the following channels on <a - href="http://www.oftc.net/oftc/">oftc</a>: + href="http://www.oftc.net/oftc/">OFTC</a>: <ul> <li><i>#tor</i> - User and relay operation discussions. Having trouble running Tor or a question for other Tor users? Then this is the spot for you.</li> <li><i>#tor-dev</i> - Channel for people who want to do development. - Discussions about Tor related coding, protocols, and <a href="<page + Discussions about Tor-related coding, protocols, and <a href="<page getinvolved/volunteer>">project ideas</a> are all welcome.</li> <li><i>#nottor</i> - This is where Tor people hang out to talk about stuff that is not related to Tor.</li>

1 0

r24859: {website} add in an email id, add the official tor phone number. (website/trunk/about/en)
by Andrew Lewman 04 Jul '11

04 Jul '11

Author: phobos Date: 2011-07-05 02:30:53 +0000 (Tue, 05 Jul 2011) New Revision: 24859 Modified: website/trunk/about/en/contact.wml Log: add in an email id, add the official tor phone number. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2011-07-05 02:26:13 UTC (rev 24858) +++ website/trunk/about/en/contact.wml 2011-07-05 02:30:53 UTC (rev 24859) @@ -13,6 +13,7 @@ <div id="maincol"> <h2>Tor: Contact</h2> + <a id="email"></a> <i>tor-assistants at torproject.org</i> is the catch-all address for everything. It can be used for reaching people working on Tor. @@ -49,6 +50,10 @@ <li><i>#nottor</i> - This is where Tor people hang out to talk about stuff that is not related to Tor.</li> </ul> + + <a id="phone"></a> + If none of the above appeal to you, calling +1-781-352-0568 will reach + the Tor office. Should there be no answer, please leave a message. </div>

1 0