- tor-commits - lists.torproject.org

[webwml/staging] Add donate-hpbanner redirect
by sebastian＠torproject.org 18 Dec '15

18 Dec '15

commit 582edea08adfb1c085ffa80c581243a4fbc33de4 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Dec 19 02:00:32 2015 +0100 Add donate-hpbanner redirect --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 0ba4884..642f8ed 100644 --- a/.htaccess +++ b/.htaccess @@ -63,4 +63,5 @@ RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-hpbanner.wml b/donate/en/donate-hpbanner.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/staging] arthuredelstein just noticed this fuckup
by sebastian＠torproject.org 18 Dec '15

18 Dec '15

commit 4f9a8587df198c07b4fc426274c25e001b00d030 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Dec 19 02:05:23 2015 +0100 arthuredelstein just noticed this fuckup --- .htaccess | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 642f8ed..8870a5a 100644 --- a/.htaccess +++ b/.htaccess @@ -53,7 +53,6 @@ RewriteRule ^relays(.*) /getinvolved/relays [R=301,L] # Donation campagin RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L] @@ -64,4 +63,6 @@ RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] +#keep prefixes of other entries down here... +RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]

1 0

[webwml/master] arthuredelstein just noticed this fuckup
by sebastian＠torproject.org 18 Dec '15

18 Dec '15

commit 4f9a8587df198c07b4fc426274c25e001b00d030 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Dec 19 02:05:23 2015 +0100 arthuredelstein just noticed this fuckup --- .htaccess | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 642f8ed..8870a5a 100644 --- a/.htaccess +++ b/.htaccess @@ -53,7 +53,6 @@ RewriteRule ^relays(.*) /getinvolved/relays [R=301,L] # Donation campagin RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L] @@ -64,4 +63,6 @@ RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] +#keep prefixes of other entries down here... +RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]

1 0

[webwml/master] Add donate-hpbanner redirect
by sebastian＠torproject.org 18 Dec '15

18 Dec '15

commit 582edea08adfb1c085ffa80c581243a4fbc33de4 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Dec 19 02:00:32 2015 +0100 Add donate-hpbanner redirect --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 0ba4884..642f8ed 100644 --- a/.htaccess +++ b/.htaccess @@ -63,4 +63,5 @@ RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-hpbanner.wml b/donate/en/donate-hpbanner.wml new file mode 100644 index 0000000..e69de29

1 0

[meek/master] Use net.IPv4zero for 0.0.0.0.
by dcf＠torproject.org 18 Dec '15

18 Dec '15

commit 8b6f0d54a621297621d97e2a066b6d77b5e6a3c7 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 18 13:50:07 2015 -0800 Use net.IPv4zero for 0.0.0.0. --- meek-client/meek-client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index a5dea2e..405230d 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -261,7 +261,7 @@ func handler(conn *pt.SocksConn) error { }() defer conn.Close() - err := conn.Grant(&net.TCPAddr{IP: net.ParseIP("0.0.0.0"), Port: 0}) + err := conn.Grant(&net.TCPAddr{IP: net.IPv4zero, Port: 0}) if err != nil { return err }

1 0

[tor/master] mark a variable unused to fix a warning.
by nickm＠torproject.org 18 Dec '15

18 Dec '15

commit 14c9b9905180a21b8aa648b642ff5d3f7d86e29f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 18 13:16:40 2015 -0500 mark a variable unused to fix a warning. --- src/common/tortls.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/tortls.c b/src/common/tortls.c index 14c283d..78f731b 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1310,6 +1310,7 @@ find_cipher_by_id(const SSL *ssl, const SSL_METHOD *m, uint16_t cipher) { const SSL_CIPHER *c; #ifdef HAVE_SSL_CIPHER_FIND + (void) m; { unsigned char cipherid[3]; tor_assert(ssl);

1 0

[tor/master] Stop building and testing Tor twice with distcheck
by nickm＠torproject.org 18 Dec '15

18 Dec '15

commit 874f982aec448142a06049008529f3748f9218c4 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sat Dec 12 01:37:33 2015 +0100 Stop building and testing Tor twice with distcheck --- Makefile.am | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index beea69d..fc9f7b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,8 +73,6 @@ dist-rpm: dist-gzip echo "RPM build finished"; \ #end of dist-rpm -dist: check - doxygen: doxygen && cd doc/doxygen/latex && make

1 0

[tor/master] changes file for 17893
by nickm＠torproject.org 18 Dec '15

18 Dec '15

commit 05f02f65c4e8ce02236c814252724b9716875ec6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 18 13:12:42 2015 -0500 changes file for 17893 --- changes/bug17893 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug17893 b/changes/bug17893 new file mode 100644 index 0000000..06808c0 --- /dev/null +++ b/changes/bug17893 @@ -0,0 +1,4 @@ + o Minor features (build): + - Since our build process now uses 'make distcheck', we no longer force + "make dist" to depend on "make check". Closes ticket 17893; + patch from "cypherpunks."

1 0

[tor/master] Log the backtrace when the backtrace test fails
by nickm＠torproject.org 18 Dec '15

18 Dec '15

commit afc5af3f00def8529d61614c73b2addc14599bc3 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Dec 17 17:31:41 2015 +0100 Log the backtrace when the backtrace test fails --- src/test/bt_test.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/test/bt_test.py b/src/test/bt_test.py index e694361..dab02d7 100755 --- a/src/test/bt_test.py +++ b/src/test/bt_test.py @@ -15,6 +15,7 @@ OK """ +from __future__ import print_function import sys @@ -37,6 +38,8 @@ for I in range(len(LINES)): if matches(LINES[I:], FUNCNAMES): print("OK") sys.exit(0) -else: - print("BAD") - sys.exit(1) + +for l in LINES: + print("{}".format(l), end="") + +sys.exit(1)

1 0

[tor/master] Remove an extra space in backtrace version string
by nickm＠torproject.org 18 Dec '15

18 Dec '15

commit 59e5bf7e2af1664f1fd019364b61b20b6e93753b Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Dec 18 12:45:51 2015 +0100 Remove an extra space in backtrace version string --- src/common/backtrace.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/backtrace.c b/src/common/backtrace.c index bed0442..94de1eb 100644 --- a/src/common/backtrace.c +++ b/src/common/backtrace.c @@ -215,9 +215,10 @@ int configure_backtrace_handler(const char *tor_version) { tor_free(bt_version); - if (!tor_version) - tor_version = ""; - tor_asprintf(&bt_version, "Tor %s", tor_version); + if (tor_version) + tor_asprintf(&bt_version, "Tor %s", tor_version); + else + tor_asprintf(&bt_version, "Tor"); return install_bt_handler(); }

1 0