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

[tor/master] Merge branch 'maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 288b3ec6035aad694942960f3b71693907f7e584 Merge: 0c3b365 0eec8e2 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 20 16:49:24 2014 -0400 Merge branch 'maint-0.2.3' into maint-0.2.4 changes/bug13100 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 87576e826f5f60d13478bb9de642be0e6f5533a1 Merge: be0e262 288b3ec Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 20 16:50:32 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 Conflicts: src/or/config.c changes/bug13100 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc src/or/config.c index 31a3586,919dd27..39b85aa --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,23 -794,23 +856,23 @@@ add_default_trusted_dir_authorities(dir "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", - "Tonga orport=443 bridge no-v2 82.94.251.203:80 " + "Tonga orport=443 bridge 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", - "turtles orport=9090 no-v2 " + "turtles orport=9090 " "v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", - "gabelmoo orport=443 no-v2 " + "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " - "212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", - "dannenberg orport=443 no-v2 " + "dannenberg orport=443 " "v3ident=585769C78764D58426B8B52B6651A5A71137189A " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " + "urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", - "maatuska orport=80 no-v2 " + "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", - "Faravahar orport=443 no-v2 " + "Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", NULL

1 0

[tor/master] Merge branch 'maint-0.2.5'
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit e170205cd8aae085687ca3b166bcc38b2134fc22 Merge: 6d6e21a 87576e8 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 20 16:51:17 2014 -0400 Merge branch 'maint-0.2.5' changes/bug13100 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.5] gabelmoo's IPv4 address changed
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 0eec8e2aa51f779e458fb3831b0ed8ae1db896ec Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Sep 19 13:40:37 2014 +0200 gabelmoo's IPv4 address changed --- changes/bug13100 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug13100 b/changes/bug13100 new file mode 100644 index 0000000..bbe43e6 --- /dev/null +++ b/changes/bug13100 @@ -0,0 +1,3 @@ + o Directory authority changes: + - Change IP address for gabelmoo (v3 directory authority). + diff --git a/src/or/config.c b/src/or/config.c index f6db98e..991c6fa 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -961,7 +961,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", "gabelmoo orport=443 no-v2 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " - "212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", "dannenberg orport=443 no-v2 " "v3ident=585769C78764D58426B8B52B6651A5A71137189A " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",

1 0

[tor/maint-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 87576e826f5f60d13478bb9de642be0e6f5533a1 Merge: be0e262 288b3ec Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 20 16:50:32 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 Conflicts: src/or/config.c changes/bug13100 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc src/or/config.c index 31a3586,919dd27..39b85aa --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,23 -794,23 +856,23 @@@ add_default_trusted_dir_authorities(dir "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", - "Tonga orport=443 bridge no-v2 82.94.251.203:80 " + "Tonga orport=443 bridge 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", - "turtles orport=9090 no-v2 " + "turtles orport=9090 " "v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", - "gabelmoo orport=443 no-v2 " + "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " - "212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", - "dannenberg orport=443 no-v2 " + "dannenberg orport=443 " "v3ident=585769C78764D58426B8B52B6651A5A71137189A " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " + "urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", - "maatuska orport=80 no-v2 " + "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", - "Faravahar orport=443 no-v2 " + "Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", NULL

1 0

[tor/maint-0.2.5] Merge branch 'maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 288b3ec6035aad694942960f3b71693907f7e584 Merge: 0c3b365 0eec8e2 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 20 16:49:24 2014 -0400 Merge branch 'maint-0.2.3' into maint-0.2.4 changes/bug13100 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.4] gabelmoo's IPv4 address changed
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 0eec8e2aa51f779e458fb3831b0ed8ae1db896ec Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Sep 19 13:40:37 2014 +0200 gabelmoo's IPv4 address changed --- changes/bug13100 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug13100 b/changes/bug13100 new file mode 100644 index 0000000..bbe43e6 --- /dev/null +++ b/changes/bug13100 @@ -0,0 +1,3 @@ + o Directory authority changes: + - Change IP address for gabelmoo (v3 directory authority). + diff --git a/src/or/config.c b/src/or/config.c index f6db98e..991c6fa 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -961,7 +961,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", "gabelmoo orport=443 no-v2 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " - "212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", "dannenberg orport=443 no-v2 " "v3ident=585769C78764D58426B8B52B6651A5A71137189A " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",

1 0

[tor/maint-0.2.4] Merge branch 'maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 288b3ec6035aad694942960f3b71693907f7e584 Merge: 0c3b365 0eec8e2 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 20 16:49:24 2014 -0400 Merge branch 'maint-0.2.3' into maint-0.2.4 changes/bug13100 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.3] gabelmoo's IPv4 address changed
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 0eec8e2aa51f779e458fb3831b0ed8ae1db896ec Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Sep 19 13:40:37 2014 +0200 gabelmoo's IPv4 address changed --- changes/bug13100 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug13100 b/changes/bug13100 new file mode 100644 index 0000000..bbe43e6 --- /dev/null +++ b/changes/bug13100 @@ -0,0 +1,3 @@ + o Directory authority changes: + - Change IP address for gabelmoo (v3 directory authority). + diff --git a/src/or/config.c b/src/or/config.c index f6db98e..991c6fa 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -961,7 +961,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", "gabelmoo orport=443 no-v2 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " - "212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", "dannenberg orport=443 no-v2 " "v3ident=585769C78764D58426B8B52B6651A5A71137189A " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",

1 0

[meek/master] A php reflector for meek
by arlo＠torproject.org 20 Sep '14

20 Sep '14

commit f5726d12dca8135144433c93a16500b05d742f88 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Sep 19 23:39:37 2014 -0700 A php reflector for meek --- README | 5 +++++ php/README | 13 +++++++++++++ php/index.php | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/README b/README index 47639ed..b216059 100644 --- a/README +++ b/README @@ -58,6 +58,11 @@ latencytest: A test program for App Engine that measures roundtrip times to different destinations. +php: +A php reflector similar to the appengine one above. Ideally, it can be run on +any platform that supports php. A public instance is at: +https://meek-reflect.herokuapp.com/ + To the extent possible under law, the authors have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any diff --git a/php/README b/php/README new file mode 100644 index 0000000..1df27d5 --- /dev/null +++ b/php/README @@ -0,0 +1,13 @@ +Ideally, this component can run on any platform that supports PHP. It lies +between meek-client and meek-server, and receives requests from the client and +forwards them to the server, then receives responses from the server and +forwards them to the client. + +To test locally, run: + php -S 127.0.0.1:8080 + +The app will be running at http://127.0.0.1:8080/. To configure meek-client to +talk to the locally running app, put this in torrc: + UseBridges 1 + Bridge meek 0.0.2.0:1 + ClientTransportPlugin meek exec ./meek-client --url=http://127.0.0.1:8080/ --log meek-client.log \ No newline at end of file diff --git a/php/index.php b/php/index.php new file mode 100644 index 0000000..b6fb9ef --- /dev/null +++ b/php/index.php @@ -0,0 +1,38 @@ +<?php + + /** + * A php reflector for meek. + */ + + $forwardURL = "http://meek.bamsoftware.com:7002/"; + + $headerArray = array(); + if ( array_key_exists("HTTP_X_SESSION_ID", $_SERVER) ) { + $headerArray[] = "X-Session-Id: " . $_SERVER["HTTP_X_SESSION_ID"]; + } + + function HeaderFunc( $ch, $header ) { + if ( explode( ":", $header )[0] == "Content-Type" ) { + header( $header ); + } + return strlen( $header ); + } + + $curlOpt = array( + CURLOPT_HTTPHEADER => $headerArray, + CURLOPT_CUSTOMREQUEST => $_SERVER["REQUEST_METHOD"], + CURLOPT_POSTFIELDS => file_get_contents("php://input"), + CURLOPT_HEADERFUNCTION => "HeaderFunc", + ); + + $ch = curl_init( $forwardURL ); + curl_setopt_array( $ch, $curlOpt ); + + if ( !curl_exec( $ch ) ) { + header("HTTP/1.1 502 Bad Gateway"); + echo "502 Bad Gateway\n"; + } + + curl_close( $ch ); + +?> \ No newline at end of file

1 0