tor-commits October 2013

tor-commits@lists.torproject.org

17 participants
1284 discussions

[tor/release-0.2.4] When examining interfaces to find an address, discard non-up ones.
by arma＠torproject.org 11 Oct '13

11 Oct '13

commit b8abadedd3cb7ac3d140becf23d0a624e6405749 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 8 16:46:29 2013 -0400 When examining interfaces to find an address, discard non-up ones. Patch from "hantwister" on trac. Fixes bug #9904; bugfix on 0.2.3.11-alpha. --- changes/bug9904 | 4 ++++ src/common/address.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/changes/bug9904 b/changes/bug9904 new file mode 100644 index 0000000..eec4144 --- /dev/null +++ b/changes/bug9904 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When examining list of network interfaces to find our address, do + not consider non-running or disabled network interfaces. Fixes bug + 9904; bugfix on 0.2.3.11-alpha. Patch from "hantwister". diff --git a/src/common/address.c b/src/common/address.c index 227b4fb..14a7b6b 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1187,6 +1187,8 @@ get_interface_addresses_raw(int severity) result = smartlist_new(); for (i = ifa; i; i = i->ifa_next) { tor_addr_t tmp; + if ((i->ifa_flags & (IFF_UP | IFF_RUNNING)) != (IFF_UP | IFF_RUNNING)) + continue; if (!i->ifa_addr) continue; if (i->ifa_addr->sa_family != AF_INET &&

1 0

[tor/release-0.2.4] Partially revert "Clarify who learns about ContactInfo."
by arma＠torproject.org 11 Oct '13

11 Oct '13

commit 73a0bb16b9b750be9a51470ff57ee654787836d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:02:53 2013 -0400 Partially revert "Clarify who learns about ContactInfo." This reverts the torrc.sample.in changes from commit 66a04a6ac334775dc396025e0c15fa49eca138a7. We're going to not make this change in 0.2.4, since changing torrc.sample.in makes all the debian users do some pointless busywork. see tor-dev discusion of 9 Oct 2013. --- src/config/torrc.sample.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 78013c2..c667efc 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -120,12 +120,9 @@ ## is per month) #AccountingStart month 3 15:00 -## Administrative contact information for this relay or bridge. This line -## can be used to contact you if your relay or bridge is misconfigured or -## something else goes wrong. Note that we archive and publish all -## descriptors containing these lines and that Google indexes them, so -## spammers might also collect them. You may want to obscure the fact that -## it's an email address and/or generate a new address for this purpose. +## Contact info to be published in the directory, so we can contact you +## if your relay is misconfigured or something else goes wrong. Google +## indexes this, so spammers might also collect it. #ContactInfo Random Person <nobody AT example dot com> ## You might also include your PGP or GPG fingerprint if you have one: #ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com>

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug9928' into maint-0.2.3
by arma＠torproject.org 11 Oct '13

11 Oct '13

commit 6eb7f2f889d9e047ea75bad15531d4aff4dbc711 Merge: dece40f bfe56e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 10:53:27 2013 -0400 Merge remote-tracking branch 'public/bug9928' into maint-0.2.3 changes/bug9928 | 6 ++++++ src/common/util.c | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-)

1 0

[tor/release-0.2.4] Changes file for 9854
by arma＠torproject.org 11 Oct '13

11 Oct '13

commit 270dcc9131668c914c8a59e615c786ca2f4fb334 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 09:43:54 2013 -0400 Changes file for 9854 --- changes/9854 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/9854 b/changes/9854 new file mode 100644 index 0000000..30105cb --- /dev/null +++ b/changes/9854 @@ -0,0 +1,3 @@ + o Documentation fixes: + - Clarify the usage and risks of ContactInfo. Resolves ticket 9854. +

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 11 Oct '13

11 Oct '13

commit 1137817319c7a9e4293e9901405d01e7b85da6ea Merge: 73a0bb1 6eb7f2f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 10:55:24 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug9928 | 6 ++++++ src/common/util.c | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-)

1 0

[tor/release-0.2.4] Fix unit test for format_helper_exit_status
by arma＠torproject.org 11 Oct '13

11 Oct '13

commit 004a9c6dd11ba71f310b750f00d5ed403faceb5a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 11:15:35 2013 -0400 Fix unit test for format_helper_exit_status Fix format_helper_exit_status to allow full HEX_ERRNO_SIZE answers, *and* increase the buffer length again. --- src/common/util.c | 4 ++-- src/test/test_util.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 5b0dbcd..b16afa1 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3294,7 +3294,7 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, * Count how many chars of space we have left, and keep a pointer into the * current point in the buffer. */ - left = HEX_ERRNO_SIZE; + left = HEX_ERRNO_SIZE+1; cur = hex_errno; /* Emit child_state */ @@ -3594,7 +3594,7 @@ tor_spawn_background(const char *const filename, const char **argv, this is used for printing out the error message */ unsigned char child_state = CHILD_STATE_INIT; - char hex_errno[HEX_ERRNO_SIZE + 1]; + char hex_errno[HEX_ERRNO_SIZE + 2]; /* + 1 should be sufficient actually */ static int max_fd = -1; diff --git a/src/test/test_util.c b/src/test/test_util.c index 4f9eb73..6c72247 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2169,6 +2169,7 @@ test_util_exit_status(void *ptr) n = format_helper_exit_status(0xFF, -0x80000000, hex_errno); test_streq("FF/-80000000\n", hex_errno); test_eq(n, strlen(hex_errno)); + test_eq(n, HEX_ERRNO_SIZE); clear_hex_errno(hex_errno); n = format_helper_exit_status(0x7F, 0, hex_errno);

1 0

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

11 Oct '13

1 0

[tor/release-0.2.4] rewrite history to improve two changelog entries
by arma＠torproject.org 11 Oct '13

11 Oct '13

commit eb5d75e96afed76b968cb87365ba6e54cac35b2e Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 10 21:17:19 2013 -0400 rewrite history to improve two changelog entries --- ChangeLog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd7f691..e08f3c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -308,8 +308,7 @@ Changes in version 0.2.4.7-alpha - 2012-12-24 network connection drastically changes. Should help with bug 3443. o Major features (IPv6): - - Tor now has (alpha) support for exiting to IPv6 addresses. To - enable it as an exit node, make sure that you have IPv6 + - Relays can now exit to IPv6 addresses: make sure that you have IPv6 connectivity, then set the IPv6Exit flag to 1. Also make sure your exit policy reads as you would like: the address * applies to all address families, whereas *4 is IPv4 address only, and *6 is IPv6 @@ -779,7 +778,7 @@ Changes in version 0.2.4.3-alpha - 2012-09-22 than it ran through the part of the loop before it had made its choice. Addresses ticket 6538. - Disable the use of Guard nodes when in Tor2WebMode. Guard usage - by tor2web clients allows hidden services to identity tor2web + by tor2web clients allows hidden services to identify tor2web clients through their repeated selection of the same rendezvous and introduction point circuit endpoints (their guards). Resolves ticket 6888.

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 11 Oct '13

11 Oct '13

commit 7b1b8c36942a09ff4c50ac228f465aa4050153e3 Merge: 1137817 004a9c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 11:18:07 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 src/common/util.c | 4 ++-- src/test/test_util.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.4] Merge branch 'bug9644_024' into maint-0.2.4
by arma＠torproject.org 11 Oct '13

11 Oct '13

commit 2c7ed0406f04caa1609014f66c08964c8b38d0b9 Merge: 7b1b8c3 7dbf667 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 11:23:46 2013 -0400 Merge branch 'bug9644_024' into maint-0.2.4 changes/bug9644 | 4 ++++ src/or/routerlist.c | 29 ++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2013