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

[tor-browser-bundle/master] Be explicit about which packages we're recording in bundle.inputs.
by mikeperry＠torproject.org 05 Aug '13

05 Aug '13

commit c7cbdf46f56054b4d5f11e3db6a5abed4790cfc7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 5 13:38:56 2013 +0200 Be explicit about which packages we're recording in bundle.inputs. So we don't pick up old versions with the wildcards, too. --- gitian/record-inputs.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index d63465b..8881161 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -14,15 +14,15 @@ cd $INPUTS_DIR rm -f bundle.inputs -sha256sum apple* >> bundle.inputs -sha256sum multiarch-darwin* >> bundle.inputs -sha256sum mingw*.zip >> bundle.inputs +sha256sum $OSXSDK_PACKAGE >> bundle.inputs +sha256sum $TOOLCHAIN4_PACKAGE >> bundle.inputs +sha256sum mingw-w64-svn-snapshot.zip >> bundle.inputs echo >> bundle.inputs #sha256sum relativelink-src.zip >> bundle.inputs #sha256sum *-langpacks.zip >> bundle.inputs sha256sum noscript(a)noscript.net.xpi >> bundle.inputs sha256sum uriloader(a)pdf.js.xpi >> bundle.inputs -sha256sum openssl-*gz >> bundle.inputs +sha256sum $OPENSSL_PACKAGE >> bundle.inputs echo >> bundle.inputs if [ "z$VERIFY_TAGS" = "z1" ];

1 0

r26281: {website} idisable the pt tbb downloads until somebody builds new ones (website/trunk/projects/en)
by Roger Dingledine 05 Aug '13

05 Aug '13

Author: arma Date: 2013-08-05 08:07:47 +0000 (Mon, 05 Aug 2013) New Revision: 26281 Modified: website/trunk/projects/en/obfsproxy.wml Log: idisable the pt tbb downloads until somebody builds new ones Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2013-08-05 02:00:34 UTC (rev 26280) +++ website/trunk/projects/en/obfsproxy.wml 2013-08-05 08:07:47 UTC (rev 26281) @@ -76,6 +76,10 @@ +Download links disabled for now until we can auto-build up-to-date +versions. Sorry! + + <h2><a class="anchor" href="#instructions">Installation Instructions</a></h2>

1 0

[tor/release-0.2.4] NumDirectoryGuards now tracks NumEntryGuards by default
by arma＠torproject.org 05 Aug '13

05 Aug '13

commit ff6bb13c02b3bb217ac8d48d5a20953f1b188d46 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jul 30 12:05:39 2013 -0400 NumDirectoryGuards now tracks NumEntryGuards by default Now a user who changes only NumEntryGuards will get the behavior she expects. Fixes bug 9354; bugfix on 0.2.4.8-alpha. --- changes/bug9354 | 5 +++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 2 +- src/or/entrynodes.c | 17 +++++++++++++---- src/or/or.h | 3 ++- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/changes/bug9354 b/changes/bug9354 new file mode 100644 index 0000000..68fc81a --- /dev/null +++ b/changes/bug9354 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Make the default behavior of NumDirectoryGuards be to track + NumEntryGuards. Now a user who changes only NumEntryGuards will get + the behavior she expects. Fixes bug 9354; bugfix on 0.2.4.8-alpha. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d5fab04..86e9afc 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1043,7 +1043,8 @@ The following options are useful only for clients (that is, if fraction of your paths. (Default: 1) **UseEntryGuardsAsDirectoryGuards** **0**|**1**:: - If this option is set to 1, we try to use our entry guards as directory + If this option is set to 1, and UseEntryGuards is also set to 1, + we try to use our entry guards as directory guards, and failing that, pick more nodes to act as our directory guards. This helps prevent an adversary from enumerating clients. It's only available for clients (non-relay, non-bridge) that aren't configured to @@ -1056,7 +1057,8 @@ The following options are useful only for clients (that is, if **NumDirectoryGuards** __NUM__:: If UseEntryGuardsAsDirectoryGuards is enabled, we try to make sure we - have at least NUM routers to use as directory guards. (Default: 3) + have at least NUM routers to use as directory guards. If this option + is set to 0, use the value from NumEntryGuards. (Default: 0) **GuardLifetime** __N__ **days**|**weeks**|**months**:: If nonzero, and UseEntryGuards is set, minimum time to keep a guard before diff --git a/src/or/config.c b/src/or/config.c index bf82643..72ceea3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -314,7 +314,7 @@ static config_var_t option_vars_[] = { OBSOLETE("NoPublish"), VAR("NodeFamily", LINELIST, NodeFamilies, NULL), V(NumCPUs, UINT, "0"), - V(NumDirectoryGuards, UINT, "3"), + V(NumDirectoryGuards, UINT, "0"), V(NumEntryGuards, UINT, "3"), V(ORListenAddress, LINELIST, NULL), VPORT(ORPort, LINELIST, NULL), diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 7a1f67d..f1af75a 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -415,14 +415,24 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, return node; } +/** Choose how many entry guards or directory guards we'll use. If + * for_directory is true, we return how many directory guards to + * use; else we return how many entry guards to use. */ +static int +decide_num_guards(const or_options_t *options, int for_directory) +{ + if (for_directory && options->NumDirectoryGuards != 0) + return options->NumDirectoryGuards; + return options->NumEntryGuards; +} + /** If the use of entry guards is configured, choose more entry guards * until we have enough in the list. */ static void pick_entry_guards(const or_options_t *options, int for_directory) { int changed = 0; - const int num_needed = for_directory ? options->NumDirectoryGuards : - options->NumEntryGuards; + const int num_needed = decide_num_guards(options, for_directory); tor_assert(entry_guards); @@ -962,8 +972,7 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, int need_capacity = state ? state->need_capacity : 0; int preferred_min, consider_exit_family = 0; int need_descriptor = !for_directory; - const int num_needed = for_directory ? options->NumDirectoryGuards : - options->NumEntryGuards; + const int num_needed = decide_num_guards(options, for_directory); if (chosen_exit) { nodelist_add_node_and_family(exit_family, chosen_exit); diff --git a/src/or/or.h b/src/or/or.h index 0b8d057..3dc96b9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3769,7 +3769,8 @@ typedef struct { int NumEntryGuards; /**< How many entry guards do we try to establish? */ int UseEntryGuardsAsDirGuards; /** Boolean: Do we try to get directory info * from a smallish number of fixed nodes? */ - int NumDirectoryGuards; /**< How many dir guards do we try to establish? */ + int NumDirectoryGuards; /**< How many dir guards do we try to establish? + * If 0, use value from NumEntryGuards. */ int RephistTrackTime; /**< How many seconds do we keep rephist info? */ int FastFirstHopPK; /**< If Tor believes it is safe, should we save a third * of our PK time by sending CREATE_FAST cells? */

1 0

[tor/release-0.2.4] Fix invalid-read when a managed proxy configuration fails.
by arma＠torproject.org 05 Aug '13

05 Aug '13

commit 5a5147dd2e5450d783de51d369378c59957733e5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jul 18 16:01:49 2013 +0300 Fix invalid-read when a managed proxy configuration fails. --- changes/bug9288 | 4 ++++ src/or/transports.c | 24 +++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/changes/bug9288 b/changes/bug9288 new file mode 100644 index 0000000..59bf414 --- /dev/null +++ b/changes/bug9288 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix an invalid memory read that occured when a pluggable + transport proxy failed its configuration protocol. + Fixes bug 9288. diff --git a/src/or/transports.c b/src/or/transports.c index b5a00c9..3749d6b 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -105,7 +105,7 @@ static void managed_proxy_destroy(managed_proxy_t *mp, int also_terminate_process); static void handle_finished_proxy(managed_proxy_t *mp); -static void configure_proxy(managed_proxy_t *mp); +static int configure_proxy(managed_proxy_t *mp); static void parse_method_error(const char *line, int is_server_method); #define parse_server_method_error(l) parse_method_error(l, 1) @@ -572,10 +572,8 @@ pt_configure_remaining_proxies(void) /* If the proxy is not fully configured, try to configure it futher. */ if (!proxy_configuration_finished(mp)) - configure_proxy(mp); - - if (proxy_configuration_finished(mp)) - at_least_a_proxy_config_finished = 1; + if (configure_proxy(mp) == 1) + at_least_a_proxy_config_finished = 1; } SMARTLIST_FOREACH_END(mp); @@ -587,10 +585,14 @@ pt_configure_remaining_proxies(void) mark_my_descriptor_dirty("configured managed proxies"); } -/** Attempt to continue configuring managed proxy mp. */ -static void +/** Attempt to continue configuring managed proxy mp. + * Return 1 if the transport configuration finished, and return 0 + * otherwise (if we still have more configuring to do for this + * proxy). */ +static int configure_proxy(managed_proxy_t *mp) { + int configuration_finished = 0; smartlist_t *proxy_output = NULL; enum stream_status stream_status = 0; @@ -600,7 +602,7 @@ configure_proxy(managed_proxy_t *mp) mp->conf_state = PT_PROTO_FAILED_LAUNCH; handle_finished_proxy(mp); } - return; + return 0; } tor_assert(mp->conf_state != PT_PROTO_INFANT); @@ -632,13 +634,17 @@ configure_proxy(managed_proxy_t *mp) done: /* if the proxy finished configuring, exit the loop. */ - if (proxy_configuration_finished(mp)) + if (proxy_configuration_finished(mp)) { handle_finished_proxy(mp); + configuration_finished = 1; + } if (proxy_output) { SMARTLIST_FOREACH(proxy_output, char *, cp, tor_free(cp)); smartlist_free(proxy_output); } + + return configuration_finished; } /** Register server managed proxy mp transports to state */

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'arma/bug9354' into maint-0.2.4
by arma＠torproject.org 05 Aug '13

05 Aug '13

commit 0a0f93d277046a524740ad110060abf8ed137b8f Merge: 5a5147d ff6bb13 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 31 21:48:48 2013 -0400 Merge remote-tracking branch 'arma/bug9354' into maint-0.2.4 changes/bug9354 | 5 +++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 2 +- src/or/entrynodes.c | 17 +++++++++++++---- src/or/or.h | 3 ++- 5 files changed, 25 insertions(+), 8 deletions(-)

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by arma＠torproject.org 05 Aug '13

05 Aug '13

commit 27fbfbbe7cc18477f828bd121e046c5547fb1000 Merge: f473dec 0a0f93d Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Aug 5 02:49:40 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug9288 | 4 ++++ changes/bug9354 | 5 +++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 2 +- src/or/entrynodes.c | 17 +++++++++++++---- src/or/or.h | 3 ++- src/or/transports.c | 24 +++++++++++++++--------- 7 files changed, 44 insertions(+), 17 deletions(-)

1 0

[tor/master] forward-port 0.2.4.15-rc changelog
by arma＠torproject.org 05 Aug '13

05 Aug '13

commit 920f5aba1aeee312502c8af69cf09aedf5b89e27 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Aug 5 02:47:40 2013 -0400 forward-port 0.2.4.15-rc changelog --- ChangeLog | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1ee5e0f..9b1aad0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +Changes in version 0.2.4.15-rc - 2013-07-01 + Tor 0.2.4.15-rc is the first release candidate for the Tor 0.2.4.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: + - When receiving a new configuration file via the control port's + LOADCONF command, do not treat the defaults file as absent. + Fixes bug 9122; bugfix on 0.2.3.9-alpha. + + o Minor features: + - Issue a warning when running with the bufferevents backend enabled. + It's still not stable, and people should know that they're likely + to hit unexpected problems. Closes ticket 9147. + + Changes in version 0.2.4.14-alpha - 2013-06-18 Tor 0.2.4.14-alpha fixes a pair of client guard enumeration problems present in 0.2.4.13-alpha.

1 0

[tor/master] forward-port the reformat of changelog stanza
by arma＠torproject.org 05 Aug '13

05 Aug '13

commit 05f5985f8e0a0a0fca660870a2476bc5f323812a Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Aug 5 02:42:27 2013 -0400 forward-port the reformat of changelog stanza --- ChangeLog | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1578728..1ee5e0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,11 +80,11 @@ Changes in version 0.2.4.13-alpha - 2013-06-14 - Relays now treat a changed IPv6 ORPort as sufficient reason to publish an updated descriptor. Fixes bug 6026; bugfix on 0.2.4.1-alpha. - - When launching a resolve request on behalf of an AF_UNIX control - socket, omit the address field of the new entry connection, used in - subsequent controller events, rather than letting tor_dup_addr() - set it to "<unknown address type>". Fixes bug 8639; bugfix on - 0.2.4.12-alpha. + - When launching a resolve request on behalf of an AF_UNIX control + socket, omit the address field of the new entry connection, used in + subsequent controller events, rather than letting tor_dup_addr() + set it to "<unknown address type>". Fixes bug 8639; bugfix on + 0.2.4.12-alpha. o Minor bugfixes (log messages): - Fix a scaling issue in the path bias accounting code that

1 0

[tor/release-0.2.4] retroactively reformat a changelog stanza
by arma＠torproject.org 05 Aug '13

05 Aug '13

commit f473dec1e002e76370bfe2310e3d74cfd910d163 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Aug 5 02:36:49 2013 -0400 retroactively reformat a changelog stanza --- ChangeLog | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e28e2ff..79d1043 100644 --- a/ChangeLog +++ b/ChangeLog @@ -112,11 +112,11 @@ Changes in version 0.2.4.13-alpha - 2013-06-14 - Relays now treat a changed IPv6 ORPort as sufficient reason to publish an updated descriptor. Fixes bug 6026; bugfix on 0.2.4.1-alpha. - - When launching a resolve request on behalf of an AF_UNIX control - socket, omit the address field of the new entry connection, used in - subsequent controller events, rather than letting tor_dup_addr() - set it to "<unknown address type>". Fixes bug 8639; bugfix on - 0.2.4.12-alpha. + - When launching a resolve request on behalf of an AF_UNIX control + socket, omit the address field of the new entry connection, used in + subsequent controller events, rather than letting tor_dup_addr() + set it to "<unknown address type>". Fixes bug 8639; bugfix on + 0.2.4.12-alpha. o Minor bugfixes (log messages): - Fix a scaling issue in the path bias accounting code that

1 0

r26280: {website} update mirror table. (website/trunk/include)
by Andrew Lewman 05 Aug '13

05 Aug '13

Author: phobos Date: 2013-08-05 02:00:34 +0000 (Mon, 05 Aug 2013) New Revision: 26280 Modified: website/trunk/include/mirrors-table.wmi Log: update mirror table. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2013-08-04 23:50:20 UTC (rev 26279) +++ website/trunk/include/mirrors-table.wmi 2013-08-05 02:00:34 UTC (rev 26280) @@ -18,6 +18,57 @@ <tr> + <td>NL</td> + + <td>Amorphis</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>NL</td> + + <td>CCC</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DK</td> + + <td>Zentrum der Gesundheit</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>EE</td> <td>CyberSIDE</td> @@ -103,6 +154,23 @@ <tr> + <td>FR</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://37.187.0.127/tormirror/dist/">http</a></td> + <td><a href="http://37.187.0.127/tormirror/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td>torservers</td> @@ -513,40 +581,6 @@ <td>US</td> - <td>AskApache</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>RU</td> - - <td>Soviet Anonymous</td> - - <td>Up to date</td> - - <td><a href="ftp://creep.im/mirrors/tor">ftp</a></td> - <td><a href="http://creep.im/tor/dist/">http</a></td> - <td><a href="http://creep.im/tor">http</a></td> - <td><a href="https://creep.im/tor/dist/">https</a></td> - <td><a href="https://creep.im/tor">https</a></td> - <td><a href="rsync://creep.im/tor-dist">rsync</a></td> - <td><a href="rsync://creep.im/tor">rsync</a></td> -</tr> - -<tr> - - <td>US</td> - <td></td> <td>Up to date</td> @@ -630,6 +664,23 @@ <tr> + <td>SE</td> + + <td>homosu</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td>[[:bbs:]]</td> @@ -715,45 +766,11 @@ <tr> - <td>NL</td> - - <td>Amorphis</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>DK</td> - - <td>Zentrum der Gesundheit</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>LT</td> <td></td> - <td>Up to date</td> + <td>DO NOT USE. Out of date.</td> <td> - </td> <td><a href="http://tor.vesta.nu/dist/">http</a></td> @@ -766,15 +783,15 @@ <tr> - <td>SE</td> + <td>US</td> - <td>homosu</td> + <td>AskApache</td> - <td>Up to date</td> + <td>DO NOT USE. Out of date.</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -872,43 +889,9 @@ <td></td> - <td>DO NOT USE. Out of date.</td> - - <td> - </td> - <td><a href="http://tor.loritsu.com/dist/">http</a></td> - <td><a href="http://tor.loritsu.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>NL</td> - - <td>CCC</td> - <td>Unknown</td> <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>US</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> <td><a href="http://tor.minibofh.org/dist/">http</a></td> <td><a href="http://tor.minibofh.org/">http</a></td> <td> - </td> @@ -987,6 +970,23 @@ <tr> + <td>US</td> + + <td></td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://tor.loritsu.com/dist/">http</a></td> + <td><a href="http://tor.loritsu.com/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>FR</td> <td></td> @@ -1038,6 +1038,23 @@ <tr> + <td>RU</td> + + <td>Soviet Anonymous</td> + + <td>Unknown</td> + + <td><a href="ftp://creep.im/mirrors/tor">ftp</a></td> + <td><a href="http://creep.im/tor/dist/">http</a></td> + <td><a href="http://creep.im/tor">http</a></td> + <td><a href="https://creep.im/tor/dist/">https</a></td> + <td><a href="https://creep.im/tor">https</a></td> + <td><a href="rsync://creep.im/tor-dist">rsync</a></td> + <td><a href="rsync://creep.im/tor">rsync</a></td> +</tr> + +<tr> + <td>US</td> <td></td>

1 0