April 2016 - tor-commits - lists.torproject.org

[user-manual/master] Dropping reference to FlashProxy
by colin＠torproject.org 13 Apr '16

13 Apr '16

commit 86a1dc86d247964c0b6b127ba601c5eae6d141b6 Author: Colin Childs <colin(a)torproject.org> Date: Tue Apr 12 20:01:19 2016 -0500 Dropping reference to FlashProxy --- C/bridges.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/C/bridges.page b/C/bridges.page index 7cf0e92..b62bc1a 100644 --- a/C/bridges.page +++ b/C/bridges.page @@ -19,7 +19,7 @@ </p> <p> -Other pluggable transports, like meek and Flashproxy, use different +Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports. </p>

1 0

[webwml/master] update the sponsors page for 2016
by arma＠torproject.org 13 Apr '16

13 Apr '16

commit dcd7277ea6a129fc10eedb5828d941dce8f49390 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Apr 12 18:31:45 2016 -0400 update the sponsors page for 2016 --- about/en/sponsors.wml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml index a763dd1..bdb3ac7 100644 --- a/about/en/sponsors.wml +++ b/about/en/sponsors.wml @@ -23,16 +23,14 @@ Tor network. </p> - <h3>Active Sponsors in 2015:</h3> + <h3>Active Sponsors in 2016:</h3> <ul> - <li><a href="<page donate/donate>">More than 4,300 personal donations from individuals like you</a> (2006-present)</li> - <li><a href="https://www.reddit.com/">Reddit</a> (2015)</li> + <li><a href="<page donate/donate>">Tens of thousands of personal donations from individuals like you</a> (2006-present)</li> + <li><a href="http://code.google.com/soc/">Google Summer of Code</a> (2007-2014 and 2016)</li> <li><a href="http://www.rfa.org/english/">Radio Free Asia</a> (2012-2016)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgia Tech and Princeton University (2012-2016)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> via University of Minnesota (2013-2017)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgetown (2015-2018)</li> - <li><a href="http://www.auswaertiges-amt.de/">Federal Foreign Office of Germany</a> (2015)</li> - <li><a href="https://digitaldefenders.org/">Hivos/The Digital Defenders Partnership</a> (2014-2015)</li> <li><a href="http://www.sri.com/">SRI International</a> (2011-2016)</li> <li><a href="http://www.state.gov/j/drl/">US Department of State Bureau of Democracy, Human Rights, and Labor</a> (2013-2016)</li> <li>An anonymous North American ISP (2009-present)</li> @@ -42,7 +40,9 @@ <p>We greatly appreciate the support provided by our past sponsors in keeping the Tor Project progressing through our ambitious goals:</p> <ul> - <li><a href="http://code.google.com/soc/">Google Summer of Code</a> (2007-2014)</li> + <li><a href="http://www.auswaertiges-amt.de/">Federal Foreign Office of Germany</a> (2015)</li> + <li><a href="https://digitaldefenders.org/">Hivos/The Digital Defenders Partnership</a> (2014-2015)</li> + <li><a href="https://www.reddit.com/">Reddit</a> (2015)</li> <li><a href="http://www.fordfoundation.org/">The Ford Foundation</a> (2013-2014)</li> <li><a href="https://disconnect.me/">Disconnect</a> (2014)</li> <li><a href="https://freedom.press/">Freedom of the Press Foundation</a> (2014)</li>

1 0

[atlas/master] Add <noscript> tag #15978
by phw＠torproject.org 12 Apr '16

12 Apr '16

commit 0de1c972b4857e77ccd8a644b7b15aeacd25c50a Author: 0xCoffee <0xcoffee(a)sigaint.org> Date: Sat Apr 9 07:46:10 2016 -0700 Add <noscript> tag #15978 Signed-off-by: Philipp Winter <phw(a)torproject.org> --- index.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/index.html b/index.html index fce43d4..b3297a1 100644 --- a/index.html +++ b/index.html @@ -48,6 +48,10 @@ <img src="img/loader.gif" /> </div> <div id="content"> + <noscript> + <h1>JavaScript required</h1> + <p>Please enable JavaScript to use this service.</p> + </noscript> </div> <hr/> <footer>

1 0

[tor/master] Write a document on how to add a test to Stem
by nickm＠torproject.org 12 Apr '16

12 Apr '16

commit 0c0bdbef2893cdabd834dcf8e7f07ac56919c9a2 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Mar 28 17:20:48 2016 +0200 Write a document on how to add a test to Stem --- doc/HACKING/WritingTests.md | 50 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/doc/HACKING/WritingTests.md b/doc/HACKING/WritingTests.md index 4e98d3d..bd2ee0e 100644 --- a/doc/HACKING/WritingTests.md +++ b/doc/HACKING/WritingTests.md @@ -417,18 +417,50 @@ makefile exports them. Writing integration tests with Stem ----------------------------------- -The 'stem' library includes extensive unit tests for the Tor controller -protocol. - -For more information on writing new tests for stem, have a look around -the `test/*` directory in stem, and find a good example to emulate. You -might want to start with -`https://gitweb.torproject.org/stem.git/tree/test/integ/control/controller.py` -to improve Tor's test coverage. - +The 'stem' library includes extensive tests for the Tor controller protocol. You can run stem tests from tor with `make test-stem`, or see `https://stem.torproject.org/faq.html#how-do-i-run-the-tests`. +To see what tests are available, have a look around the `test/*` directory in +stem. The first thing you'll notice is that there are both `unit` and `integ` +tests. The former are for tests of the facilities provided by stem itself that +can be tested on their own, without the need to hook up a tor process. These +are less relevant, unless you want to develop a new stem feature. The latter, +however, are a very useful tool to write tests for controller features. They +provide a default environment with a connected tor instance that can be +modified and queried. Adding more integration tests is a great way to increase +the test coverage inside Tor, especially for controller features. + +Let's assume you actually want to write a test for a previously untested +controller feature. I'm picking the `exit-policy/*` GETINFO queries. Since +these are a controller feature that we want to write an integration test for, +the right file to modify is +`https://gitweb.torproject.org/stem.git/tree/test/integ/control/controller.py`. + +First off we notice that there is an integration test called +`test_get_exit_policy()` that's already written. This exercises the interaction +of stem's `Controller.get_exit_policy()` method, and is not relevant for our +test since there are no stem methods to make use of all `exit-policy/*` +queries (if there were, likely they'd be tested already. Maybe you want to +write a stem feature, but I chose to just add tests). + +Our test requires a tor controller connection, so we'll use the +`@require_controller` annotation for our `test_exit_policy()` method. We need a +controller instance, which we get from +`test.runner.get_runner().get_tor_controller()`. The attached Tor instance is +configured as a client, but the exit-policy GETINFO queries need a relay to +work, so we have to change the config (using `controller.set_options()`). This +is OK for us to do, we just have to remember to set DisableNetwork so we don't +actually start an exit relay and also to undo the changes we made (by calling +`controller.reset_conf()` at the end of our test). Additionally, we have to +configure a static Address for Tor to use, because it refuses to build a +descriptor when it can't guess a suitable IP address. Unfortunately, these +kinds of tripwires are everywhere. Don't forget to file appropriate tickets if +you notice any strange behaviour that seems totally unreasonable. + +Check out the `test_exit_policy()` function in abovementioned file to see the +final implementation for this test. + System testing with Chutney ---------------------------

1 0

[tor/master] Merge remote-tracking branch 'sebastian/stemtest'
by nickm＠torproject.org 12 Apr '16

12 Apr '16

commit bd34edc18d6e21f5ba7bddf5a7ebe6582e8dc639 Merge: eafcd7b 0c0bdbe Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 12 13:13:15 2016 -0400 Merge remote-tracking branch 'sebastian/stemtest' doc/HACKING/WritingTests.md | 50 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 9 deletions(-)

1 0

[tor/release-0.2.8] memarea: Don't assume that sizeof(ulong) >= sizeof(void*).
by nickm＠torproject.org 12 Apr '16

12 Apr '16

commit 39c057d45a67f9aa80bc05df85ec8deafdb6f46a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 7 11:10:14 2016 -0400 memarea: Don't assume that sizeof(ulong) >= sizeof(void*). Fixes bug 18716; bugfix on 0.2.1.1-alpha where memarea.c was introduced. Found by wbenny. --- changes/bug18716 | 4 ++++ src/common/memarea.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug18716 b/changes/bug18716 new file mode 100644 index 0000000..b15a343 --- /dev/null +++ b/changes/bug18716 @@ -0,0 +1,4 @@ + o Minor bugfixes (assert, portability): + - Fix an assertion failure in memarea.c on systems where "long" is + shorter than the size of a pointer. + Fixes bug 18716; bugfix on 0.2.1.1-alpha diff --git a/src/common/memarea.c b/src/common/memarea.c index 6841ba5..6c7e4c7 100644 --- a/src/common/memarea.c +++ b/src/common/memarea.c @@ -22,9 +22,9 @@ #define MEMAREA_ALIGN SIZEOF_VOID_P #if MEMAREA_ALIGN == 4 -#define MEMAREA_ALIGN_MASK 3lu +#define MEMAREA_ALIGN_MASK ((uintptr_t)3) #elif MEMAREA_ALIGN == 8 -#define MEMAREA_ALIGN_MASK 7lu +#define MEMAREA_ALIGN_MASK ((uintptr_t)7) #else #error "void* is neither 4 nor 8 bytes long. I don't know how to align stuff." #endif

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 12 Apr '16

12 Apr '16

commit eafcd7b0fccb0993d6c8bcaabc40231d0bdb5289 Merge: 5910292 7babf33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 12 13:02:37 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18481 | 5 +++ changes/bug18716 | 4 ++ doc/tor.1.txt | 100 +++++++++++++++++++++++------------------------- src/common/memarea.c | 4 +- src/or/config.c | 60 +++++++++++++---------------- src/or/directory.c | 6 +-- src/or/networkstatus.c | 6 +-- src/or/or.h | 12 +++--- src/test/test_options.c | 6 +-- 9 files changed, 100 insertions(+), 103 deletions(-)

1 0

[tor/release-0.2.8] Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8
by nickm＠torproject.org 12 Apr '16

12 Apr '16

commit 7babf33239eb1e349826753a9d0405cb59150cce Merge: 40827da 39c057d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 12 13:02:02 2016 -0400 Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8 changes/bug18716 | 4 ++++ src/common/memarea.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --cc src/common/memarea.c index cfba80b,6c7e4c7..0a3fd00 --- a/src/common/memarea.c +++ b/src/common/memarea.c @@@ -21,12 -21,10 +21,12 @@@ * value. */ #define MEMAREA_ALIGN SIZEOF_VOID_P +/** A value which, when masked out of a pointer, produces a maximally aligned + * pointer. */ #if MEMAREA_ALIGN == 4 - #define MEMAREA_ALIGN_MASK 3lu + #define MEMAREA_ALIGN_MASK ((uintptr_t)3) #elif MEMAREA_ALIGN == 8 - #define MEMAREA_ALIGN_MASK 7lu + #define MEMAREA_ALIGN_MASK ((uintptr_t)7) #else #error "void* is neither 4 nor 8 bytes long. I don't know how to align stuff." #endif

1 0

[tor/maint-0.2.8] memarea: Don't assume that sizeof(ulong) >= sizeof(void*).
by nickm＠torproject.org 12 Apr '16

12 Apr '16

commit 39c057d45a67f9aa80bc05df85ec8deafdb6f46a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 7 11:10:14 2016 -0400 memarea: Don't assume that sizeof(ulong) >= sizeof(void*). Fixes bug 18716; bugfix on 0.2.1.1-alpha where memarea.c was introduced. Found by wbenny. --- changes/bug18716 | 4 ++++ src/common/memarea.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug18716 b/changes/bug18716 new file mode 100644 index 0000000..b15a343 --- /dev/null +++ b/changes/bug18716 @@ -0,0 +1,4 @@ + o Minor bugfixes (assert, portability): + - Fix an assertion failure in memarea.c on systems where "long" is + shorter than the size of a pointer. + Fixes bug 18716; bugfix on 0.2.1.1-alpha diff --git a/src/common/memarea.c b/src/common/memarea.c index 6841ba5..6c7e4c7 100644 --- a/src/common/memarea.c +++ b/src/common/memarea.c @@ -22,9 +22,9 @@ #define MEMAREA_ALIGN SIZEOF_VOID_P #if MEMAREA_ALIGN == 4 -#define MEMAREA_ALIGN_MASK 3lu +#define MEMAREA_ALIGN_MASK ((uintptr_t)3) #elif MEMAREA_ALIGN == 8 -#define MEMAREA_ALIGN_MASK 7lu +#define MEMAREA_ALIGN_MASK ((uintptr_t)7) #else #error "void* is neither 4 nor 8 bytes long. I don't know how to align stuff." #endif

1 0

[tor/maint-0.2.8] Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8
by nickm＠torproject.org 12 Apr '16

12 Apr '16

commit 7babf33239eb1e349826753a9d0405cb59150cce Merge: 40827da 39c057d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 12 13:02:02 2016 -0400 Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8 changes/bug18716 | 4 ++++ src/common/memarea.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --cc src/common/memarea.c index cfba80b,6c7e4c7..0a3fd00 --- a/src/common/memarea.c +++ b/src/common/memarea.c @@@ -21,12 -21,10 +21,12 @@@ * value. */ #define MEMAREA_ALIGN SIZEOF_VOID_P +/** A value which, when masked out of a pointer, produces a maximally aligned + * pointer. */ #if MEMAREA_ALIGN == 4 - #define MEMAREA_ALIGN_MASK 3lu + #define MEMAREA_ALIGN_MASK ((uintptr_t)3) #elif MEMAREA_ALIGN == 8 - #define MEMAREA_ALIGN_MASK 7lu + #define MEMAREA_ALIGN_MASK ((uintptr_t)7) #else #error "void* is neither 4 nor 8 bytes long. I don't know how to align stuff." #endif

1 0