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

[tor/master] Make check-spaces happy again
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 1e008e98767fb1b98142a4099a837bbb2ce818f4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 15:40:08 2012 -0400 Make check-spaces happy again --- src/test/test_util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index b07fa3b..8877444 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1472,7 +1472,7 @@ test_util_control_formats(void) } else { \ TT_FAIL(("%s ~~ %s: %f != %f",#value1,#value2,v1,v2)); \ } \ - } while(0) + } while (0) static void test_util_sscanf(void)

1 0

[tor/maint-0.2.3] bump to 0.2.3.18-rc
by arma＠torproject.org 28 Jun '12

28 Jun '12

commit 64f8e68e65f32c742eab85d993da2a838f90dcf3 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 28 15:34:33 2012 -0400 bump to 0.2.3.18-rc --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 556bb66..e9ef4f8 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.17-beta-dev) +AM_INIT_AUTOMAKE(tor, 0.2.3.18-rc) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 6643925..75b2567 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.17-beta-dev" +!define VERSION "0.2.3.18-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 3449277..a5bd2ee 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.17-beta-dev" +#define VERSION "0.2.3.18-rc"

1 0

[tor/maint-0.2.3] add a blurb for 0.2.3.18-rc, other minor cleanups
by arma＠torproject.org 28 Jun '12

28 Jun '12

commit 81cd3d7ad641a8dbf1076e011d209cfc3d6af2b0 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 28 15:32:36 2012 -0400 add a blurb for 0.2.3.18-rc, other minor cleanups --- ChangeLog | 29 +++++++++++++++++------------ src/common/util.c | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8eb082c..3d666a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ Changes in version 0.2.3.18-rc - 2012-06-28 + Tor 0.2.3.18-rc is the first release candidate for the Tor 0.2.3.x + series. It fixes a few smaller bugs, but generally appears stable. + Please test it and let us know whether it is! o Major bugfixes: - Allow wildcarded mapaddress targets to be specified on the @@ -15,6 +18,10 @@ Changes in version 0.2.3.18-rc - 2012-06-28 upload", so that they no longer confusingly imply that we're sending something to a directory we might not even be connected to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha. + - Make sure to set *socket_error in all error cases in + connection_connect(), so it can't produce a warning about + errno being zero from errno_to_orconn_end_reason(). Bugfix on + 0.2.1.1-alpha; resolves ticket 6028. - Downgrade "Got a certificate, but we already have it" log messages from warning to info, except when we're a dirauth. Fixes bug 5238; bugfix on 0.2.1.7-alpha. @@ -25,10 +32,16 @@ Changes in version 0.2.3.18-rc - 2012-06-28 Fixes bug 5932; bugfix on 0.2.2.7-alpha. o Minor bugfixes (on 0.2.3.x): + - Make format_helper_exit_status() avoid unnecessary space padding + and stop confusing log_from_pipe(). Fixes ticket 5557; bugfix + on 0.2.3.1-alpha. - Downgrade a message about cleaning the microdescriptor cache to "info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha. - - Improve log message issued when a managed proxy fails to - launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha. + - Log a BUG message at severity INFO if we have a networkstatus with + a missing entry for some microdescriptor. Continues on a patch + to 0.2.3.2-alpha. + - Improve the log message when a managed proxy fails to launch. Fixes + bug 5099; bugfix on 0.2.3.6-alpha. - Don't do DNS lookups when parsing corrupted managed proxy protocol messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha. - When formatting wildcarded address mappings for the controller, @@ -36,22 +49,14 @@ Changes in version 0.2.3.18-rc - 2012-06-28 bugfix on 0.2.3.9-alpha. - Avoid a warning caused by using strcspn() from glibc with clang 3.0. Bugfix on 0.2.3.13-alpha. - - Make format_helper_exit_status() avoid unnecessary space padding and - stop confusing log_from_pipe(). Fixes ticket 5557. - - Make sure to set *socket_error in all error cases in - connection_connect(), so it can't produce a warning about errno - being zero from errno_to_orconn_end_reason(). Resolves ticket 6028. - - Remove non-bug log messages about running with circuit timeout - learning enabled from LD_BUG. Fixes bug 6169; bugfix on - 0.2.3.17-beta. + - Stop logging messages about running with circuit timeout learning + enabled at severity LD_BUG. Fixes bug 6169; bugfix on 0.2.3.17-beta. - Disable a spurious warning about reading on a marked and flushing connection. We shouldn't be doing that, but apparently we sometimes do. Fixes bug 6203; bugfix on 0.2.3.17-beta. - Fix a bug that stopped AllowDotExit from working on addresses that had an entry in the DNS cache. Fixes bug 6211; bugfix on 0.2.3.17-beta. - - Log a BUG message at INFO if we have a networkstatus with a missing - entry for some microdescriptor. o Code simplification, refactoring, unit tests: - Move tor_gettimeofday_cached() into compat_libevent.c, and use diff --git a/src/common/util.c b/src/common/util.c index 51d9321..a0dff2e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3888,7 +3888,7 @@ tor_get_exit_code(const process_handle_t *process_handle, } /** Helper: return the number of characters in s preceding the first - * occurence of ch. If ch does not occur in s, return + * occurrence of ch. If ch does not occur in s, return * the length of s. Should be equivalent to strspn(s, "ch"). */ static INLINE size_t str_num_before(const char *s, char ch)

1 0

[torspec/master] Change extra-info prefix of 180 from "method" to "transport".
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 989b4a68a2639d14b7b96f63a65fcf6619cb239a Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Mar 15 14:31:23 2012 -0700 Change extra-info prefix of 180 from "method" to "transport". --- proposals/180-pluggable-transport.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index eb180dc..433cad1 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -478,7 +478,7 @@ Advertising bridge methods Bridges put the 'method' lines in their extra-info documents. - method SP <methodname> SP <address:port> [SP arglist] NL + transport SP <transportname> SP <address:port> [SP arglist] NL The address:port are as returned from an SMETHOD line (unless they are replaced by the FORWARD: directive). The arglist is a K=V,... list as @@ -487,7 +487,7 @@ Advertising bridge methods If the SMETHOD line includes a DECLARE: part, the router descriptor gets a new line: - method-info SP <methodname> [SP arglist] NL + transport-info SP <transportname> [SP arglist] NL Bridge authority behavior

1 0

[torspec/master] Update dir-spec wrt to pluggable transports in extra-info.
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 8b725914cac69c5a4d208e0835a1404e40e41970 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Mar 15 14:31:45 2012 -0700 Update dir-spec wrt to pluggable transports in extra-info. --- dir-spec.txt | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index ab8b064..b7cbefd 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -888,6 +888,12 @@ List of mappings from ports to the number of opened exit streams to that port, rounded up to the nearest multiple of 4. + "transport" transportname address:port [arglist] NL + [Any number.] + + Signals that the router supports the 'transportname' pluggable + transport in IP address 'address' and TCP port 'port'. + "router-signature" NL Signature NL [At end, exactly once.]

1 0

[torspec/master] Merge remote-tracking branch 'asn/bug5396'
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 41a353eccef256044f2c977fe83cca91fbe5f7f8 Merge: de32af6 8b72591 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 15:23:52 2012 -0400 Merge remote-tracking branch 'asn/bug5396' dir-spec.txt | 6 ++++++ proposals/180-pluggable-transport.txt | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --cc dir-spec.txt index fe2ed5d,b7cbefd..8403c52 --- a/dir-spec.txt +++ b/dir-spec.txt @@@ -911,10 -886,14 +911,16 @@@ [At most once.] List of mappings from ports to the number of opened exit streams - to that port, rounded up to the nearest multiple of 4. + to that port, rounded up to the nearest multiple of 4. Relays may + limit the number of listed ports and subsume any remaining opened + streams under port "other". + "transport" transportname address:port [arglist] NL + [Any number.] + + Signals that the router supports the 'transportname' pluggable + transport in IP address 'address' and TCP port 'port'. + "router-signature" NL Signature NL [At end, exactly once.]

1 0

[tor/master] add new GETINFO config/defaults
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 12298901fd6a8ce0608129cf9e65dfc32d161a57 Author: meejah <meejah(a)meejah.ca> Date: Thu Apr 5 15:17:30 2012 -0600 add new GETINFO config/defaults returns the default values for every configuration item, similar to GETINFO config/names; include a changes entry for it. Fix for bug 4971 --- changes/bug4971 | 2 ++ src/or/config.c | 14 ++++++++++++++ src/or/control.c | 3 +++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/changes/bug4971 b/changes/bug4971 new file mode 100644 index 0000000..8c7d830 --- /dev/null +++ b/changes/bug4971 @@ -0,0 +1,2 @@ + o Minor Feature: + - Provide default values for all options via "GETINFO config/defaults" diff --git a/src/or/config.c b/src/or/config.c index 042fc1a..ceb21b0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -7180,6 +7180,20 @@ getinfo_helper_config(control_connection_t *conn, *answer = smartlist_join_strings(sl, "", 0, NULL); SMARTLIST_FOREACH(sl, char *, c, tor_free(c)); smartlist_free(sl); + } else if (!strcmp(question, "config/defaults")) { + smartlist_t *sl = smartlist_new(); + int i; + for (i = 0; _option_vars[i].name; ++i) { + const config_var_t *var = &_option_vars[i]; + if (var->initvalue != NULL) { + char *val = esc_for_log(var->initvalue); + smartlist_add_asprintf(sl, "%s %s\n",var->name,val); + tor_free(val); + } + } + *answer = smartlist_join_strings(sl, "", 0, NULL); + SMARTLIST_FOREACH(sl, char *, c, tor_free(c)); + smartlist_free(sl); } return 0; } diff --git a/src/or/control.c b/src/or/control.c index 6675c01..0387f4b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2123,6 +2123,9 @@ static const getinfo_item_t getinfo_items[] = { PREFIX("config/", config, "Current configuration values."), DOC("config/names", "List of configuration options, types, and documentation."), + DOC("config/defaults", + "List of default values for configuration options. " + "See also config/names"), ITEM("info/names", misc, "List of GETINFO options, types, and documentation."), ITEM("events/names", misc,

1 0

[torspec/master] description for new GETINFO config/defaults
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit a9bddcfc61569dc399fe71305d97910a25682b9b Author: meejah <meejah(a)meejah.ca> Date: Fri Apr 6 21:35:47 2012 -0600 description for new GETINFO config/defaults --- control-spec.txt | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 15970e5..5fd0619 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -617,6 +617,14 @@ "Dependant" / "Virtual" / "String" / "LineList" Documentation = Text + "config/defaults" + A series of lines listing default values for each configuration + option. Options which don't have a valid default don't show up + in the list. + OptionName SP OptionValue CRLF + OptionName = Keyword + OptionValue = Text + "info/names" A series of lines listing the available GETINFO options. Each is of one of these forms:

1 0

[torspec/master] Merge remote-tracking branch 'meejah/4971'
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit d716b885bbc91c6f885bb77174a80816c1d61faf Merge: 903a65f a9bddcf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 15:17:22 2012 -0400 Merge remote-tracking branch 'meejah/4971' control-spec.txt | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)

1 0

[torspec/master] Say when config/defaults first appears
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit de32af6f314a28e68b60b5c6994b83eb627587d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 15:17:45 2012 -0400 Say when config/defaults first appears --- control-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 1ef672d..1625aa9 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -626,7 +626,7 @@ "config/defaults" A series of lines listing default values for each configuration option. Options which don't have a valid default don't show up - in the list. + in the list. Introduced in Tor 0.2.4.1-alpha. OptionName SP OptionValue CRLF OptionName = Keyword OptionValue = Text

1 0