October 2017 - tor-commits - lists.torproject.org

[orbot/master] update version to 15.4.4-BETA-1
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit d86ace63da4a990dc3e8201b25cb565120f31cb1 Author: n8fr8 <nathan(a)freitas.net> Date: Fri Oct 20 00:15:24 2017 -0400 update version to 15.4.4-BETA-1 update gradle depends --- app/build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dd90ed24..96cf0fdf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,22 +26,22 @@ android { applicationId 'org.torproject.android' targetSdkVersion 23 maxSdkVersion 23 - versionCode 15430000 - versionName '15.4.3-RC-1-multi-SDK16' + versionCode 15440000 + versionName '15.4.4-BETA-1-multi-SDK16' } fullperm { minSdkVersion 23 applicationId 'org.torproject.android' targetSdkVersion 25 - versionCode 15430001 - versionName '15.4.3-RC-1-multi-SDK23' + versionCode 15440001 + versionName '15.4.3-BETA-1-multi-SDK23' } } } dependencies { compile project(':orbotservice') - compile 'com.android.support:support-v4:25.0.0' - compile 'com.android.support:appcompat-v7:25.0.0' - compile 'com.android.support:design:25.0.0' + compile 'com.android.support:support-v4:25.3.1' + compile 'com.android.support:appcompat-v7:25.3.1' + compile 'com.android.support:design:25.3.1' }

1 0

[orbot/master] remove unused permission
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit f09508def5774f15ade4c30a6652a1437f2d613e Author: n8fr8 <nathan(a)freitas.net> Date: Tue Oct 24 22:16:01 2017 -0400 remove unused permission --- app/src/fullperm/AndroidManifest.xml | 9 +-------- app/src/main/AndroidManifest.xml | 8 -------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/app/src/fullperm/AndroidManifest.xml b/app/src/fullperm/AndroidManifest.xml index 4389408c..dadd11c8 100644 --- a/app/src/fullperm/AndroidManifest.xml +++ b/app/src/fullperm/AndroidManifest.xml @@ -6,14 +6,7 @@ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="25" /> -  + <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8369083f..94c33920 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,14 +3,6 @@ package="org.torproject.android" android:installLocation="auto"> -  <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

1 0

[tor/maint-0.3.2] Rewrite bridge addresses earlier
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 9b60acd4d4ee451fd961b1f03ae46eee960c72ee Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Sep 28 17:15:47 2017 -0500 Rewrite bridge addresses earlier Call rewrite_node_address_for_bridge() in launch_direct_bridge_descriptor_fetch() in case there's an existing node_t for it. --- changes/bug20532 | 4 ++++ src/or/bridges.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/changes/bug20532 b/changes/bug20532 new file mode 100644 index 000000000..7c190ea03 --- /dev/null +++ b/changes/bug20532 @@ -0,0 +1,4 @@ + o Minor bugfixes (bridges): + - Overwrite the bridge address earlier in the process of directly + retrieving its descriptor, to make sure we reach it on the configured + address. Fixes bug 20532; bugfix on 0.2.0.10-alpha. diff --git a/src/or/bridges.c b/src/or/bridges.c index 0818fb081..0bcc3eeb4 100644 --- a/src/or/bridges.c +++ b/src/or/bridges.c @@ -54,6 +54,8 @@ struct bridge_info_t { }; static void bridge_free(bridge_info_t *bridge); +static void rewrite_node_address_for_bridge(const bridge_info_t *bridge, + node_t *node); /** A list of configured bridges. Whenever we actually get a descriptor * for one, we add it as an entry guard. Note that the order of bridges @@ -571,6 +573,12 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) return; } + /* If we already have a node_t for this bridge, rewrite its address now. */ + node_t *node = node_get_mutable_by_id(bridge->identity); + if (node) { + rewrite_node_address_for_bridge(bridge, node); + } + tor_addr_port_t bridge_addrport; memcpy(&bridge_addrport.addr, &bridge->addr, sizeof(tor_addr_t)); bridge_addrport.port = bridge->port;

1 0

[tor/master] Rewrite bridge addresses earlier
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 9b60acd4d4ee451fd961b1f03ae46eee960c72ee Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Sep 28 17:15:47 2017 -0500 Rewrite bridge addresses earlier Call rewrite_node_address_for_bridge() in launch_direct_bridge_descriptor_fetch() in case there's an existing node_t for it. --- changes/bug20532 | 4 ++++ src/or/bridges.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/changes/bug20532 b/changes/bug20532 new file mode 100644 index 000000000..7c190ea03 --- /dev/null +++ b/changes/bug20532 @@ -0,0 +1,4 @@ + o Minor bugfixes (bridges): + - Overwrite the bridge address earlier in the process of directly + retrieving its descriptor, to make sure we reach it on the configured + address. Fixes bug 20532; bugfix on 0.2.0.10-alpha. diff --git a/src/or/bridges.c b/src/or/bridges.c index 0818fb081..0bcc3eeb4 100644 --- a/src/or/bridges.c +++ b/src/or/bridges.c @@ -54,6 +54,8 @@ struct bridge_info_t { }; static void bridge_free(bridge_info_t *bridge); +static void rewrite_node_address_for_bridge(const bridge_info_t *bridge, + node_t *node); /** A list of configured bridges. Whenever we actually get a descriptor * for one, we add it as an entry guard. Note that the order of bridges @@ -571,6 +573,12 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) return; } + /* If we already have a node_t for this bridge, rewrite its address now. */ + node_t *node = node_get_mutable_by_id(bridge->identity); + if (node) { + rewrite_node_address_for_bridge(bridge, node); + } + tor_addr_port_t bridge_addrport; memcpy(&bridge_addrport.addr, &bridge->addr, sizeof(tor_addr_t)); bridge_addrport.port = bridge->port;

1 0

[tor/master] Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit e7126a1030233fd656cff4a8ee998026065fb65b Merge: b95ef19a7 9b60acd4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 19:41:26 2017 -0400 Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2 changes/bug20532 | 4 ++++ src/or/bridges.c | 8 ++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit e7126a1030233fd656cff4a8ee998026065fb65b Merge: b95ef19a7 9b60acd4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 19:41:26 2017 -0400 Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2 changes/bug20532 | 4 ++++ src/or/bridges.c | 8 ++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/master] Turn a comment into a doxygen comment.
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 3498183807fa626289aab98ed8b2477176a70190 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 19:42:18 2017 -0400 Turn a comment into a doxygen comment. Crediting this * to teor, in penance for mis-crediting his x removal to Isis. The balance is restored. --- src/or/or.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/or.h b/src/or/or.h index 26f00b718..d1746d9a6 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2245,7 +2245,7 @@ typedef struct { * a purpose we didn't recognize. */ #define ROUTER_PURPOSE_UNKNOWN 255 - /* In what way did we find out about this router? One of ROUTER_PURPOSE_*. + /** In what way did we find out about this router? One of ROUTER_PURPOSE_*. * Routers of different purposes are kept segregated and used for different * things; see notes on ROUTER_PURPOSE_* macros above. */

1 0

[tor/release-0.3.2] Rewrite bridge addresses earlier
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 9b60acd4d4ee451fd961b1f03ae46eee960c72ee Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Sep 28 17:15:47 2017 -0500 Rewrite bridge addresses earlier Call rewrite_node_address_for_bridge() in launch_direct_bridge_descriptor_fetch() in case there's an existing node_t for it. --- changes/bug20532 | 4 ++++ src/or/bridges.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/changes/bug20532 b/changes/bug20532 new file mode 100644 index 000000000..7c190ea03 --- /dev/null +++ b/changes/bug20532 @@ -0,0 +1,4 @@ + o Minor bugfixes (bridges): + - Overwrite the bridge address earlier in the process of directly + retrieving its descriptor, to make sure we reach it on the configured + address. Fixes bug 20532; bugfix on 0.2.0.10-alpha. diff --git a/src/or/bridges.c b/src/or/bridges.c index 0818fb081..0bcc3eeb4 100644 --- a/src/or/bridges.c +++ b/src/or/bridges.c @@ -54,6 +54,8 @@ struct bridge_info_t { }; static void bridge_free(bridge_info_t *bridge); +static void rewrite_node_address_for_bridge(const bridge_info_t *bridge, + node_t *node); /** A list of configured bridges. Whenever we actually get a descriptor * for one, we add it as an entry guard. Note that the order of bridges @@ -571,6 +573,12 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) return; } + /* If we already have a node_t for this bridge, rewrite its address now. */ + node_t *node = node_get_mutable_by_id(bridge->identity); + if (node) { + rewrite_node_address_for_bridge(bridge, node); + } + tor_addr_port_t bridge_addrport; memcpy(&bridge_addrport.addr, &bridge->addr, sizeof(tor_addr_t)); bridge_addrport.port = bridge->port;

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit e5c341eb7c1189985d903f708ce91516da7f0c76 Merge: 349818380 e7126a103 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 19:43:13 2017 -0400 Merge branch 'maint-0.3.2' changes/bug20532 | 4 ++++ src/or/bridges.c | 8 ++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit e7126a1030233fd656cff4a8ee998026065fb65b Merge: b95ef19a7 9b60acd4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 19:41:26 2017 -0400 Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2 changes/bug20532 | 4 ++++ src/or/bridges.c | 8 ++++++++ 2 files changed, 12 insertions(+)

1 0