- tor-commits - lists.torproject.org

[tor/master] fix punctuation in logs
by arma＠torproject.org 06 Sep '12

06 Sep '12

commit 00120544a4bfa9c26d2c8a336389d33b8b3642c2 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 6 01:35:05 2012 -0400 fix punctuation in logs --- src/or/dirserv.c | 2 +- src/or/router.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 086db03..7f46906 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -727,7 +727,7 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) "MAX_DESCRIPTOR_UPLOAD_SIZE (%d) constant is too low.", ri->nickname, source, (int)ri->cache_info.signed_descriptor_len, MAX_DESCRIPTOR_UPLOAD_SIZE); - *msg = "Router descriptor was too large"; + *msg = "Router descriptor was too large."; control_event_or_authdir_new_descriptor("REJECTED", ri->cache_info.signed_descriptor_body, ri->cache_info.signed_descriptor_len, *msg); diff --git a/src/or/router.c b/src/or/router.c index 2cb0e26..9a3ef9d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -672,7 +672,7 @@ init_keys(void) * we don't really need new keys yet so the descriptor doesn't * change and the old one is still fresh. */ log_info(LD_GENERAL, "Couldn't add own descriptor to directory " - "after key init: %s. This is usually not a problem.", + "after key init: %s This is usually not a problem.", m?m:"<unknown error>"); } }

1 0

[tor/master] Fix warning when implicitly casting strlen(microdesc) to int
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit 5d679caa32c71a8bc7d4ed4ab716349e603e642c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 20:49:25 2012 -0400 Fix warning when implicitly casting strlen(microdesc) to int Harmless unless we somehow generate a microdesc of more than INT_MAX bytes. --- changes/ssize_t_warning | 4 ++++ src/or/dirvote.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/ssize_t_warning b/changes/ssize_t_warning new file mode 100644 index 0000000..01609cc --- /dev/null +++ b/changes/ssize_t_warning @@ -0,0 +1,4 @@ + o Minor build fixes: + - Fix a harmless (in this case) build warning for implicitly + converting a strlen() to an int. Bugfix on 0.2.4.1-alpha. + diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 8e85b2b..ea85636 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3606,7 +3606,7 @@ dirvote_format_microdesc_vote_line(char *out_buf, size_t out_buf_len, int consensus_method_low, int consensus_method_high) { - int ret = -1; + ssize_t ret = -1; char d64[BASE64_DIGEST256_LEN+1]; char *microdesc_consensus_methods = make_consensus_method_list(consensus_method_low,

1 0

[tor/master] bump to 0.2.4.1-alpha-dev
by arma＠torproject.org 06 Sep '12

06 Sep '12

commit a504a81d22c9f000fefd44093c4a18693b8228fc Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 5 20:05:50 2012 -0400 bump to 0.2.4.1-alpha-dev --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 0bde608..dc1c249 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.1-alpha]) +AC_INIT([tor],[0.2.4.1-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 0195e33..b7163c3 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.4.1-alpha" +!define VERSION "0.2.4.1-alpha-dev" !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 88c802c..286854f 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.4.1-alpha" +#define VERSION "0.2.4.1-alpha-dev"

1 0

r25782: {website} two new tarballs are available (there's no space on the down (website/trunk/include)
by Roger Dingledine 05 Sep '12

05 Sep '12

Author: arma Date: 2012-09-05 23:29:55 +0000 (Wed, 05 Sep 2012) New Revision: 25782 Modified: website/trunk/include/versions.wmi Log: two new tarballs are available (there's no space on the download page for 0.2.4.1-alpha yet.) Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-09-05 23:10:06 UTC (rev 25781) +++ website/trunk/include/versions.wmi 2012-09-05 23:29:55 UTC (rev 25782) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.2.38</define-tag> -<define-tag version-alpha whitespace=delete>0.2.3.20-rc</define-tag> +<define-tag version-alpha whitespace=delete>0.2.3.21-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.38</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.3.20-rc</define-tag>

1 0

[tor/master] bump to 0.2.4.1-alpha
by arma＠torproject.org 05 Sep '12

05 Sep '12

commit 237129847b824925058975f8da665cd8cb1bed13 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 5 19:12:22 2012 -0400 bump to 0.2.4.1-alpha --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index dba2fec..0bde608 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.0-alpha-dev]) +AC_INIT([tor],[0.2.4.1-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 2d6d1db..0195e33 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.4.0-alpha-dev" +!define VERSION "0.2.4.1-alpha" !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 4c8c655..88c802c 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.4.0-alpha-dev" +#define VERSION "0.2.4.1-alpha"

1 0

r25781: {website} add a new mirror and update status of others. (in website/trunk: . include)
by Andrew Lewman 05 Sep '12

05 Sep '12

Author: phobos Date: 2012-09-05 23:10:06 +0000 (Wed, 05 Sep 2012) New Revision: 25781 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add a new mirror and update status of others. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-09-04 21:25:59 UTC (rev 25780) +++ website/trunk/include/mirrors-table.wmi 2012-09-05 23:10:06 UTC (rev 25781) @@ -35,6 +35,23 @@ <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>US</td> <td>Quintex</td> @@ -307,6 +324,40 @@ <tr> + <td>MY</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.me0w.cc/dist/">http</a></td> + <td><a href="http://tor.me0w.cc/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>LT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td></td> @@ -596,6 +647,23 @@ <tr> + <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>FR</td> <td>LazyTiger</td> @@ -715,57 +783,6 @@ <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>LT</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <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>DE</td> <td>[[:bbs:]]</td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-09-04 21:25:59 UTC (rev 25780) +++ website/trunk/update-mirrors.pl 2012-09-05 23:10:06 UTC (rev 25781) @@ -1070,6 +1070,24 @@ httpsDistMirror => "https://tor.fodt.co.at/dist/", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror075 => { + adminContact => "", + orgName => "", + isoCC => "MY", + subRegion => "", + region => "MY", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.me0w.cc/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://tor.me0w.cc/dist/", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0

[tor/master] finish changelog mucking for 0.2.4.1-alpha
by arma＠torproject.org 05 Sep '12

05 Sep '12

commit 606157ea62604d1b2395d32f27cae69adde7c77e Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 5 19:05:41 2012 -0400 finish changelog mucking for 0.2.4.1-alpha --- ChangeLog | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12b7fff..bf051a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ Changes in version 0.2.4.1-alpha - 2012-09-05 - Tor 0.2.4.1-alpha adds ... XXX + Tor 0.2.4.1-alpha lets bridges publish their pluggable transports to + bridgedb; lets relays use IPv6 addresses and directory authorities + advertise them; and switches to a cleaner build interface. This is the first alpha release in a new series, so expect there to be bugs. Users who would rather test out a more stable branch should @@ -63,11 +65,11 @@ Changes in version 0.2.4.1-alpha - 2012-09-05 Implements ticket 4971. o Minor features (IPv6): - - New config option "AuthDirHasIPv6Connectivity auto" that ... XXX - Implements feature 5974. + - New config option "AuthDirHasIPv6Connectivity 1" that directory + authorities should set if they have IPv6 connectivity and want to + do reachability tests for IPv6 relays. Implements feature 5974. - A relay with an IPv6 OR port now sends that address in NETINFO cells (in addition to its other address). Implements ticket 6364. - - New config option AuthDirPublishIPv6. Implements ticket 6406. o Minor features (log messages): - Omit the first heartbeat log message, because it never has anything

1 0

[tor/master] make AuthDirHasIPv6Connectivity match the man page
by arma＠torproject.org 05 Sep '12

05 Sep '12

commit b00b8272daa63e54e25f51bef7850c1c185dba5c Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 5 18:17:41 2012 -0400 make AuthDirHasIPv6Connectivity match the man page we can turn it into an autobool later if we have some way for it to make a decision. (patch possibly got lost when nickm merged #6770; or maybe nickm meant for it to be this way. i'm not sure.) --- src/or/config.c | 2 +- src/or/or.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 6027668..a4a794a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -204,7 +204,7 @@ static config_var_t _option_vars[] = { V(AuthDirListBadExits, BOOL, "0"), V(AuthDirMaxServersPerAddr, UINT, "2"), V(AuthDirMaxServersPerAuthAddr,UINT, "5"), - V(AuthDirHasIPv6Connectivity, AUTOBOOL, "0"), + V(AuthDirHasIPv6Connectivity, BOOL, "0"), VAR("AuthoritativeDirectory", BOOL, AuthoritativeDir, "0"), V(AutomapHostsOnResolve, BOOL, "0"), V(AutomapHostsSuffixes, CSV, ".onion,.exit"), diff --git a/src/or/or.h b/src/or/or.h index 0b321fd..3609d32 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3323,7 +3323,7 @@ typedef struct { int AuthDirMaxServersPerAuthAddr; /**< Do not permit more than this * number of servers per IP address shared * with an authority. */ - int AuthDirHasIPv6Connectivity; /**< Autoboolean: are we on IPv6? */ + int AuthDirHasIPv6Connectivity; /**< Boolean: are we on IPv6? */ /** If non-zero, always vote the Fast flag for any relay advertising * this amount of capacity or more. */

1 0

[tor/master] and fold it into master too
by arma＠torproject.org 05 Sep '12

05 Sep '12

commit 325f33047a72050cbe3c35a5dc2ca156d012c996 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 5 17:23:08 2012 -0400 and fold it into master too --- ChangeLog | 2 ++ changes/bug6774 | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab0fd25..12b7fff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -178,6 +178,8 @@ Changes in version 0.2.3.21-rc - 2012-09-05 when provided via the controller's MapAddress command. Previously, they were accepted, but we never actually noticed that they were wildcards. Fixes bug 6244; bugfix on 0.2.3.9-alpha. + - Avoid crashing on a malformed state file where EntryGuardPathBias + precedes EntryGuard. Fix for bug 6774; bugfix on 0.2.3.17-beta. - Add a (probably redundant) memory clear between iterations of the router status voting loop, to prevent future coding errors where data might leak between iterations of the loop. Resolves diff --git a/changes/bug6774 b/changes/bug6774 deleted file mode 100644 index 0c137fd..0000000 --- a/changes/bug6774 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Avoid crashing on a malformed state file where EntryGuardPathBias - precedes EntryGuard. Fix for bug 6774; bugfix on 0.2.3.17-beta. -

1 0

[tor/release-0.2.3] Update the minimum bandwidth for a public relay
by arma＠torproject.org 05 Sep '12

05 Sep '12

commit 97dbff51e60273b29d7dc15e4106c600e8efa34e Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 5 16:40:57 2012 -0400 Update the minimum bandwidth for a public relay The current cutoff is 30KB, but in reality a useful cutoff is probably more like 50KB or 100KB. --- doc/tor.1.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 62259b7..0bd9709 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -126,8 +126,8 @@ GENERAL OPTIONS A token bucket limits the average incoming bandwidth usage on this node to the specified number of bytes per second, and the average outgoing bandwidth usage to that same value. If you want to run a relay in the - public network, this needs to be _at the very least_ 20 KB (that is, - 20480 bytes). (Default: 5 MB) + public network, this needs to be _at the very least_ 30 KB (that is, + 30720 bytes). (Default: 5 MB) **BandwidthBurst** __N__ **bytes**|**KB**|**MB**|**GB**:: Limit the maximum token bucket size (also known as the burst) to the given

1 0