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

r25795: {website} add some experimental support options. (website/trunk/about/en)
by Andrew Lewman 15 Sep '12

15 Sep '12

Author: phobos Date: 2012-09-15 02:46:34 +0000 (Sat, 15 Sep 2012) New Revision: 25795 Modified: website/trunk/about/en/contact.wml Log: add some experimental support options. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2012-09-14 15:13:03 UTC (rev 25794) +++ website/trunk/about/en/contact.wml 2012-09-15 02:46:34 UTC (rev 25795) @@ -17,6 +17,7 @@ <li><a href="#identica">Identi.ca</a></li> <li><a href="#irc">IRC</a></li> <li><a href="#livechat">Live Chat</a></li> + <li><a href="#sms">SMS/Text Messaging</a></li> <li><a href="#phone">Telephone</a></li> </ul> @@ -84,12 +85,21 @@ href="http://www.cypherpunks.ca/otr/">Off-the-Record</a> Messenging.</p> + <a id="sms"></a> + <h3><a class="anchor" href="#sms">SMS/Text Messaging</a></h3> + <p>We've started an experimental SMS/Text Messaging contact + system. The following number can receive SMS/Text Messages from + anywhere: +15088010746. Please be aware that your phone company and + ours (and everyone in between) could see the messages.</p> + <a id="phone"></a> <h3><a class="anchor" href="#phone">Telephone</a></h3> <p>If none of the above appeal to you, calling +1-781-948-1982 - will reach the Tor office. Should there be no answer, please leave - a message with a way to reach you. Please email - <i>help(a)rt.torproject.org</i> for technical support.</p> + will reach the Tor office. Should there be no answer, please leave + a message with a way to reach you. Please be aware that your phone + company and ours (and everyone in between) could listen to the + call. Please email <i>help(a)rt.torproject.org</i> for technical + support.</p> </div>

1 0

[ooni-probe/master] Merge branch 'bridget-twisted'
by isis＠torproject.org 15 Sep '12

15 Sep '12

commit 963cad2a4610be403a2592f5d2fa7b4aca05062b Merge: cf5e13c 3d87617 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Sep 15 01:12:13 2012 +0000 Merge branch 'bridget-twisted' ooni/plugins/bridget.py | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)

1 0

[ooni-probe/master] Updated documentation in ooni/plugins/bridget.py.
by isis＠torproject.org 15 Sep '12

15 Sep '12

commit 3d87617306002854b69f8de1b2ff2702d671a0f2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Sep 14 00:14:58 2012 +0000 Updated documentation in ooni/plugins/bridget.py. --- ooni/plugins/bridget.py | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ooni/plugins/bridget.py b/ooni/plugins/bridget.py index a53630c..95f7453 100644 --- a/ooni/plugins/bridget.py +++ b/ooni/plugins/bridget.py @@ -406,16 +406,15 @@ bridget = BridgetTest(None, None, None) ## ----------- ## self.config.save() only needs to be called if Tor is already running. ## -## need to add transport type to torrc Bridge line: -## Bridge <transport> IP:ORPort <fingerprint> -## ## TODO: ## o add option for any kwarg=arg self.config setting ## o cleanup documentation +## x add DataDirectory option ## o check if bridges are public relays ## o take bridge_desc file as input, also be able to give same ## format as output -## o change the stupid name ## ## FIX: -## data directory is not found, or permissions aren't right +## o DataDirectory is not found, or permissions aren't right +## o Bridge line needs generation of transport properties +## Bridge <transport> IP:ORPort <fingerprint>

1 0

[torbrowser/maint-2.2] update recommended-versions
by erinn＠torproject.org 14 Sep '12

14 Sep '12

commit f9cf082d092ad420c2da5a3814d9cb39d1898c8b Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 14 21:27:02 2012 +0100 update recommended-versions --- build-scripts/recommended-versions | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index ba836de..846caf9 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,11 +1,11 @@ [ -"2.2.38-2-MacOS-i386", -"2.2.38-2-MacOS-x86_64", -"2.2.38-2-Windows", -"2.2.38-2-Linux-i686", -"2.2.38-2-Linux-x86_64", -"2.3.20-alpha-1-MacOS-i386", -"2.3.20-alpha-1-Windows", -"2.3.20-alpha-1-Linux-i386", -"2.3.20-alpha-1-Linux-x86_64" +"2.2.39-1-MacOS-i386", +"2.2.39-1-MacOS-x86_64", +"2.2.39-1-Windows", +"2.2.39-1-Linux-i686", +"2.2.39-1-Linux-x86_64", +"2.3.22-alpha-1-MacOS-i386", +"2.3.22-alpha-1-Windows", +"2.3.22-alpha-1-Linux-i386", +"2.3.22-alpha-1-Linux-x86_64" ]

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 14 Sep '12

14 Sep '12

commit 19d3c1fbf8650887e99b6b5cbceb9365dafb8571 Merge: b954810 f9cf082 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 14 21:27:14 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)

1 0

[torbrowser/master] update recommended-versions
by erinn＠torproject.org 14 Sep '12

14 Sep '12

commit f9cf082d092ad420c2da5a3814d9cb39d1898c8b Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 14 21:27:02 2012 +0100 update recommended-versions --- build-scripts/recommended-versions | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index ba836de..846caf9 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,11 +1,11 @@ [ -"2.2.38-2-MacOS-i386", -"2.2.38-2-MacOS-x86_64", -"2.2.38-2-Windows", -"2.2.38-2-Linux-i686", -"2.2.38-2-Linux-x86_64", -"2.3.20-alpha-1-MacOS-i386", -"2.3.20-alpha-1-Windows", -"2.3.20-alpha-1-Linux-i386", -"2.3.20-alpha-1-Linux-x86_64" +"2.2.39-1-MacOS-i386", +"2.2.39-1-MacOS-x86_64", +"2.2.39-1-Windows", +"2.2.39-1-Linux-i686", +"2.2.39-1-Linux-x86_64", +"2.3.22-alpha-1-MacOS-i386", +"2.3.22-alpha-1-Windows", +"2.3.22-alpha-1-Linux-i386", +"2.3.22-alpha-1-Linux-x86_64" ]

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 14 Sep '12

14 Sep '12

commit 19d3c1fbf8650887e99b6b5cbceb9365dafb8571 Merge: b954810 f9cf082 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 14 21:27:14 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)

1 0

[torbrowser/maint-2.3] update recommended-versions
by erinn＠torproject.org 14 Sep '12

14 Sep '12

commit f9cf082d092ad420c2da5a3814d9cb39d1898c8b Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 14 21:27:02 2012 +0100 update recommended-versions --- build-scripts/recommended-versions | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index ba836de..846caf9 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,11 +1,11 @@ [ -"2.2.38-2-MacOS-i386", -"2.2.38-2-MacOS-x86_64", -"2.2.38-2-Windows", -"2.2.38-2-Linux-i686", -"2.2.38-2-Linux-x86_64", -"2.3.20-alpha-1-MacOS-i386", -"2.3.20-alpha-1-Windows", -"2.3.20-alpha-1-Linux-i386", -"2.3.20-alpha-1-Linux-x86_64" +"2.2.39-1-MacOS-i386", +"2.2.39-1-MacOS-x86_64", +"2.2.39-1-Windows", +"2.2.39-1-Linux-i686", +"2.2.39-1-Linux-x86_64", +"2.3.22-alpha-1-MacOS-i386", +"2.3.22-alpha-1-Windows", +"2.3.22-alpha-1-Linux-i386", +"2.3.22-alpha-1-Linux-x86_64" ]

1 0

[atlas/master] Add full exit policy to details page, after summary.
by karsten＠torproject.org 14 Sep '12

14 Sep '12

commit ab11ee350b772bd1945bb277b9854f6bc51ac796 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 14 13:54:27 2012 -0400 Add full exit policy to details page, after summary. --- templates/details/main.html | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/templates/details/main.html b/templates/details/main.html index 673e36b..088b6b8 100644 --- a/templates/details/main.html +++ b/templates/details/main.html @@ -39,6 +39,11 @@ <pre>reject<% _.each(relay.get('exit_policy_summary')['reject'], function(ports) { %><br> <%= $.trim(ports) %><% });} %></pre> </dd> + <dt><span class="tip" data-content="Policy of exit connections that the relay is going to accept or reject." data-original-title="Exit policy">Exit Policy</span></dt> + <dd> + <pre><% _.each(relay.get('exit_policy'), function(line) { %> +<%= $.trim(line) %><% }); %></pre> + </dd> </dl>

1 0

[tor/master] Use file-size-fixup code on cygwin too.
by nickm＠torproject.org 14 Sep '12

14 Sep '12

commit b1447a4312c47f13bf8ddddab09f19ee73640a3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 12:37:17 2012 -0400 Use file-size-fixup code on cygwin too. We already had code on windows to fix our file sizes when we're reading a file in text mode and its size doesn't match the size from fstat. But that code was only enabled when _WIN32 was defined, and Cygwin defines __CYGWIN__ instead. Fixes bug 6844; bugfix on 0.1.2.7-alpha. --- changes/bug6844 | 4 ++++ src/common/util.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug6844 b/changes/bug6844 new file mode 100644 index 0000000..338e19d --- /dev/null +++ b/changes/bug6844 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Correct file sizes when reading binary files on + Cygwin, to avoid a bug where Tor would fail to read its state file. + Fixes bug 6844; bugfix on 0.1.2.7-alpha. diff --git a/src/common/util.c b/src/common/util.c index 55f4d90..6fb597a 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2322,7 +2322,7 @@ read_file_to_str(const char *filename, int flags, struct stat *stat_out) } string[r] = '\0'; /* NUL-terminate the result. */ -#ifdef _WIN32 +#if defined(_WIN32) || defined(__CYGWIN__) if (!bin && strchr(string, '\r')) { log_debug(LD_FS, "We didn't convert CRLF to LF as well as we hoped " "when reading %s. Coping.",

1 0