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

[orbot/master] adding dummyactivity to stop task/broadcast from killing foreground service
by n8fr8＠torproject.org 29 Nov '14

29 Nov '14

commit 1e0f640a2068d2db5bae2c36a9477fb2042282e1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 24 23:12:53 2014 -0500 adding dummyactivity to stop task/broadcast from killing foreground service --- AndroidManifest.xml | 24 ++++++++++++++++---- .../torproject/android/service/DummyActivity.java | 15 ++++++++++++ src/org/torproject/android/service/TorService.java | 6 ++++- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index de175f9..223475f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,11 +2,11 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" android:versionName="14.1.3-PIE" - android:versionCode="130" + android:versionCode="131" android:installLocation="auto" > - <uses-sdk android:minSdkVersion="21" android:maxSdkVersion="21" android:targetSdkVersion="21"/> + <uses-sdk android:minSdkVersion="9" android:maxSdkVersion="20" android:targetSdkVersion="19"/> <permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label" android:description="@string/permission_manage_tor_description" android:protectionLevel="signature"></permission> <uses-permission android:name="android.permission.INTERNET" /> @@ -24,10 +24,13 @@ android:allowClearUserData="true" android:persistent="true" android:stopWithTask="false" + > - <activity android:name=".Orbot" android:configChanges="orientation|screenSize" + <activity android:name=".Orbot" + android:configChanges="orientation|screenSize" android:launchMode="singleTop" + android:excludeFromRecents="true" > <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -73,7 +76,20 @@  - + <activity + android:name=".service.DummyActivity" + android:theme="@android:style/Theme.NoDisplay" + android:enabled="true" + android:allowTaskReparenting="true" + android:noHistory="true" + android:excludeFromRecents="true" + android:alwaysRetainTaskState="false" + android:stateNotNeeded="true" + android:clearTaskOnLaunch="true" + android:finishOnTaskLaunch="true" + /> + + <activity android:name=".wizard.LotsaText" android:exported="false"/> <activity android:name=".wizard.Permissions" android:exported="false"/> <activity android:name=".wizard.TipsAndTricks" android:exported="false"/> diff --git a/src/org/torproject/android/service/DummyActivity.java b/src/org/torproject/android/service/DummyActivity.java new file mode 100644 index 0000000..5400ba4 --- /dev/null +++ b/src/org/torproject/android/service/DummyActivity.java @@ -0,0 +1,15 @@ +package org.torproject.android.service; + +import android.app.Activity; +import android.os.Bundle; + +/* + * To combat background service being stopped/swiped + */ +public class DummyActivity extends Activity { + @Override + public void onCreate( Bundle icicle ) { + super.onCreate( icicle ); + finish(); + } +} \ No newline at end of file diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 6323d83..71b2ed7 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -412,7 +412,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst @Override public void onTaskRemoved(Intent rootIntent) { - logNotice("Orbot was swiped away... background service will keep running"); + //logNotice("Orbot was swiped away... background service will keep running"); + + Intent intent = new Intent( this, DummyActivity.class ); + intent.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); + startActivity( intent ); } @Override

1 0

[tor-messenger-build/master] Rebase prepare patch, again
by arlo＠torproject.org 28 Nov '14

28 Nov '14

commit 9d2f724c13e46cfb336cce53f6e797f42be73ec0 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Nov 28 09:45:36 2014 -0800 Rebase prepare patch, again --- projects/instantbird/prepare-messages-for-displaying.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/instantbird/prepare-messages-for-displaying.patch b/projects/instantbird/prepare-messages-for-displaying.patch index 4828728..c9dc42b 100644 --- a/projects/instantbird/prepare-messages-for-displaying.patch +++ b/projects/instantbird/prepare-messages-for-displaying.patch @@ -1,9 +1,9 @@ # HG changeset patch # User Arlo Breault <arlolra(a)gmail.com> -# Date 1417058407 28800 -# Wed Nov 26 19:20:07 2014 -0800 -# Node ID 0108590a22b0943081fe0f26375834da2f84b0b6 -# Parent e4c698528d69e8d4e2116bbf2e28f91fd5b5f972 +# Date 1417196598 28800 +# Fri Nov 28 09:43:18 2014 -0800 +# Node ID ddcfdad3c07c6304ce3de53f38ba0adec98ea53a +# Parent 523fa3fa1fd619423f7267fdd2b3b215bcb93d1b Prepare messages for displaying * Adds a converse method to prepareForSending. @@ -44,7 +44,7 @@ diff --git a/chat/components/public/prplIConversation.idl b/chat/components/publ #include "nsISimpleEnumerator.idl" #include "nsIObserver.idl" - interface imIAccountBuddy; + interface prplIAccountBuddy; interface imIAccount; interface imIOutgoingMessage; +interface imIMessage;

1 0

[tor/master] Fix some 32-bit build issues in the tests
by nickm＠torproject.org 28 Nov '14

28 Nov '14

commit 11b652acb382b181927d2c31a50e4c8621615083 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 28 10:06:10 2014 -0500 Fix some 32-bit build issues in the tests When comparing 64-bit types, you need to use tt_[ui]64_op(). Found by Jenkins --- src/test/test_channel.c | 44 ++++++++++++++++++++++---------------------- src/test/test_scheduler.c | 8 ++++---- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/test/test_channel.c b/src/test/test_channel.c index 49590f5..8213db6 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -1134,11 +1134,11 @@ test_channel_multi(void *arg) /* Initial queue size update */ channel_update_xmit_queue_size(ch1); - tt_int_op(ch1->bytes_queued_for_xmit, ==, 0); + tt_u64_op(ch1->bytes_queued_for_xmit, ==, 0); channel_update_xmit_queue_size(ch2); - tt_int_op(ch2->bytes_queued_for_xmit, ==, 0); + tt_u64_op(ch2->bytes_queued_for_xmit, ==, 0); global_queue_estimate = channel_get_global_queue_estimate(); - tt_int_op(global_queue_estimate, ==, 0); + tt_u64_op(global_queue_estimate, ==, 0); /* Queue some cells, check queue estimates */ cell = tor_malloc_zero(sizeof(cell_t)); @@ -1151,10 +1151,10 @@ test_channel_multi(void *arg) channel_update_xmit_queue_size(ch1); channel_update_xmit_queue_size(ch2); - tt_int_op(ch1->bytes_queued_for_xmit, ==, 0); - tt_int_op(ch2->bytes_queued_for_xmit, ==, 0); + tt_u64_op(ch1->bytes_queued_for_xmit, ==, 0); + tt_u64_op(ch2->bytes_queued_for_xmit, ==, 0); global_queue_estimate = channel_get_global_queue_estimate(); - tt_int_op(global_queue_estimate, ==, 0); + tt_u64_op(global_queue_estimate, ==, 0); /* Stop accepting cells at lower layer */ test_chan_accept_cells = 0; @@ -1165,18 +1165,18 @@ test_channel_multi(void *arg) channel_write_cell(ch1, cell); channel_update_xmit_queue_size(ch1); - tt_int_op(ch1->bytes_queued_for_xmit, ==, 512); + tt_u64_op(ch1->bytes_queued_for_xmit, ==, 512); global_queue_estimate = channel_get_global_queue_estimate(); - tt_int_op(global_queue_estimate, ==, 512); + tt_u64_op(global_queue_estimate, ==, 512); cell = tor_malloc_zero(sizeof(cell_t)); make_fake_cell(cell); channel_write_cell(ch2, cell); channel_update_xmit_queue_size(ch2); - tt_int_op(ch2->bytes_queued_for_xmit, ==, 512); + tt_u64_op(ch2->bytes_queued_for_xmit, ==, 512); global_queue_estimate = channel_get_global_queue_estimate(); - tt_int_op(global_queue_estimate, ==, 1024); + tt_u64_op(global_queue_estimate, ==, 1024); /* Allow cells through again */ test_chan_accept_cells = 1; @@ -1187,10 +1187,10 @@ test_channel_multi(void *arg) /* Update and check queue sizes */ channel_update_xmit_queue_size(ch1); channel_update_xmit_queue_size(ch2); - tt_int_op(ch1->bytes_queued_for_xmit, ==, 512); - tt_int_op(ch2->bytes_queued_for_xmit, ==, 0); + tt_u64_op(ch1->bytes_queued_for_xmit, ==, 512); + tt_u64_op(ch2->bytes_queued_for_xmit, ==, 0); global_queue_estimate = channel_get_global_queue_estimate(); - tt_int_op(global_queue_estimate, ==, 512); + tt_u64_op(global_queue_estimate, ==, 512); /* Flush chan 1 */ channel_flush_cells(ch1); @@ -1198,10 +1198,10 @@ test_channel_multi(void *arg) /* Update and check queue sizes */ channel_update_xmit_queue_size(ch1); channel_update_xmit_queue_size(ch2); - tt_int_op(ch1->bytes_queued_for_xmit, ==, 0); - tt_int_op(ch2->bytes_queued_for_xmit, ==, 0); + tt_u64_op(ch1->bytes_queued_for_xmit, ==, 0); + tt_u64_op(ch2->bytes_queued_for_xmit, ==, 0); global_queue_estimate = channel_get_global_queue_estimate(); - tt_int_op(global_queue_estimate, ==, 0); + tt_u64_op(global_queue_estimate, ==, 0); /* Now block again */ test_chan_accept_cells = 0; @@ -1218,10 +1218,10 @@ test_channel_multi(void *arg) /* Check the estimates */ channel_update_xmit_queue_size(ch1); channel_update_xmit_queue_size(ch2); - tt_int_op(ch1->bytes_queued_for_xmit, ==, 512); - tt_int_op(ch2->bytes_queued_for_xmit, ==, 512); + tt_u64_op(ch1->bytes_queued_for_xmit, ==, 512); + tt_u64_op(ch2->bytes_queued_for_xmit, ==, 512); global_queue_estimate = channel_get_global_queue_estimate(); - tt_int_op(global_queue_estimate, ==, 1024); + tt_u64_op(global_queue_estimate, ==, 1024); /* Now close channel 2; it should be subtracted from the global queue */ MOCK(scheduler_release_channel, scheduler_release_channel_mock); @@ -1229,7 +1229,7 @@ test_channel_multi(void *arg) UNMOCK(scheduler_release_channel); global_queue_estimate = channel_get_global_queue_estimate(); - tt_int_op(global_queue_estimate, ==, 512); + tt_u64_op(global_queue_estimate, ==, 512); /* * Since the fake channels aren't registered, channel_free_all() can't @@ -1240,7 +1240,7 @@ test_channel_multi(void *arg) UNMOCK(scheduler_release_channel); global_queue_estimate = channel_get_global_queue_estimate(); - tt_int_op(global_queue_estimate, ==, 0); + tt_u64_op(global_queue_estimate, ==, 0); /* Now free everything */ MOCK(scheduler_release_channel, scheduler_release_channel_mock); @@ -1435,7 +1435,7 @@ test_channel_queue_size(void *arg) channel_update_xmit_queue_size(ch); tt_int_op(ch->bytes_queued_for_xmit, ==, 0); global_queue_estimate = channel_get_global_queue_estimate(); - tt_int_op(global_queue_estimate, ==, 0); + tt_u64_op(global_queue_estimate, ==, 0); /* Test the call-through to our fake lower layer */ n = channel_num_cells_writeable(ch); diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index d031214..a7a1acc 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -729,22 +729,22 @@ test_scheduler_queue_heuristic(void *arg) /* Not yet inited case */ scheduler_update_queue_heuristic(now - 180); - tt_int_op(queue_heuristic, ==, 0); + tt_u64_op(queue_heuristic, ==, 0); tt_int_op(queue_heuristic_timestamp, ==, now - 180); queue_heuristic = 1000000000L; queue_heuristic_timestamp = now - 120; scheduler_update_queue_heuristic(now - 119); - tt_int_op(queue_heuristic, ==, 500000000L); + tt_u64_op(queue_heuristic, ==, 500000000L); tt_int_op(queue_heuristic_timestamp, ==, now - 119); scheduler_update_queue_heuristic(now - 116); - tt_int_op(queue_heuristic, ==, 62500000L); + tt_u64_op(queue_heuristic, ==, 62500000L); tt_int_op(queue_heuristic_timestamp, ==, now - 116); qh = scheduler_get_queue_heuristic(); - tt_int_op(qh, ==, 0); + tt_u64_op(qh, ==, 0); done: return;

1 0

[tor/master] Fix a signed/unsigned comparison warning in scheduler_run
by nickm＠torproject.org 28 Nov '14

28 Nov '14

commit 430f5852ac1c19cea295fd1cb4c362777f1de21a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 28 09:18:17 2014 -0500 Fix a signed/unsigned comparison warning in scheduler_run --- src/or/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 61f69b3..d1a15aa 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -418,7 +418,7 @@ scheduler_run, (void)) flushed_this_time = channel_flush_some_cells(chan, MIN(sched_max_flush_cells, - n_cells - flushed)); + (size_t) n_cells - flushed)); if (flushed_this_time <= 0) break; flushed += flushed_this_time; }

1 0

[tor-browser-bundle/maint-4.0] Updated config.yml for 4.0.2
by gk＠torproject.org 28 Nov '14

28 Nov '14

commit 6ea30dc92d1d4682706ad88971f324a6383434b7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 28 12:53:13 2014 +0000 Updated config.yml for 4.0.2 --- tools/update-responses/config.yml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 2132373..bdecdec 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -4,20 +4,27 @@ build_targets: linux64: Linux_x86_64-gcc3 win32: WINNT_x86-gcc3 osx32: Darwin_x86-gcc3 + osx64: Darwin_x86_64-gcc3 channels: - release: 4.0.1 - alpha: 4.0.1 + release: 4.0.2 + alpha: 4.5-alpha-1 versions: - 4.0: - platformVersion: 31.2.0 + 4.0.2: + platformVersion: 31.3.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0 - 4.0.1: + download_url: https://www.torproject.org/dist/torbrowser/4.0.2 + incremental_from: + - 4.0 + - 4.0.1 + 4.5-alpha-1: platformVersion: 31.2.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0.1 + download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-1 incremental_from: - 4.0 -# osx32: -# minSupportedOSVersion: 10.7 -# unsupported: 1 + - 4.0.1 + migrate_archs: + osx32: osx64 + osx32: + minSupportedOSVersion: 10.8 + detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda…

1 0

[tor-browser-bundle/maint-4.0] update_responses: add support for arch migration
by gk＠torproject.org 28 Nov '14

28 Nov '14

commit c17dc8aa81fb10d27dc1b9a8c3ca4116414cccfa Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 6 23:07:16 2014 +0100 update_responses: add support for arch migration --- tools/update-responses/update_responses | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index a42e700..c788586 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -219,6 +219,14 @@ sub write_responses { get_version_files($config, $version); create_missing_incremental_mars($config, $version); my $files = $config->{versions}{$version}{files}; + my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; + foreach my $old_os (keys %$migrate_archs) { + my $new_os = $migrate_archs->{$old_os}; + foreach my $lang (keys %{$files->{$new_os}}) { + $files->{$old_os}{$lang}{complete} = + $files->{$new_os}{$lang}{complete}; + } + } foreach my $os (keys %$files) { foreach my $lang (keys %{$files->{$os}}) { my $resp = get_response($config, $version, $os,

1 0

[tor-browser-bundle/maint-4.0] Bumped HTTPS-E; updated changelog/versions.
by gk＠torproject.org 28 Nov '14

28 Nov '14

commit ee0f34c497292135a0cd05a7791444fc324d44f5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 28 10:33:31 2014 +0000 Bumped HTTPS-E; updated changelog/versions. --- Bundle-Data/Docs/ChangeLog.txt | 4 +++- gitian/versions | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 65c0493..50f7974 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,17 +2,19 @@ Tor Browser 4.0.2 -- Dec 2 2014 * All Platforms * Update Firefox to 31.3.0esr * Update NoScript to 2.6.9.5 + * Update HTTPS Everywhere to 4.0.2 * Update Torbutton to 1.7.0.2 * Bug 13019: Synchronize locale spoofing pref with our Firefox patch * Bug 13746: Properly link Torbutton UI to thirdparty pref. * Bug 13742: Fix domain isolation for content cache and disk-enabled browsing mode * Bug 5926: Prevent JS engine locale leaks (by setting the C library locale) + * Bug 13504: Remove unreliable/unreachable non-public bridges + * Bug 13435: Remove our custom POODLE fix * Windows * Bug 13443: Re-enable DirectShow; fix crash with mingw patch. * Bug 13558: Fix crash on Windows XP during download folder changing * Bug 13594: Fix update failure for Windows XP users - Tor Browser 4.0.1 -- Oct 30 2014 * All Platforms * Update Tor to 0.2.5.10 diff --git a/gitian/versions b/gitian/versions index 31677e1..6f9d97b 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=4.0.1 +TORBROWSER_VERSION=4.0.2 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -8,7 +8,7 @@ FIREFOX_VERSION=31.3.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build2 TOR_TAG=tor-0.2.5.10 TORLAUNCHER_TAG=0.2.7.0.1 TORBUTTON_TAG=1.7.0.2 @@ -47,7 +47,7 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=4.0.1 +HTTPSE_VER=4.0.2 GO_VER=1.3.3 ## File names for the source packages @@ -82,7 +82,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a -HTTPSE_HASH=cd811b1d424ff24939249de1e2b745ba86cbd7e6804699a9460c631a0b3474fe +HTTPSE_HASH=c83f9bc10f3da6e33e2242c7944fd2bb534708821685bef7b9d16850550cc858 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/maint-4.0] Merge branch 'isis/bug13504' into maint-4.0
by gk＠torproject.org 28 Nov '14

28 Nov '14

commit 8704443fa6f3c9ff7c971f8ea8b1e215f11fae35 Merge: 44e03fe d54502b Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 28 09:37:50 2014 +0000 Merge branch 'isis/bug13504' into maint-4.0 Bundle-Data/PTConfigs/bridge_prefs.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)

1 0

[tor-browser-bundle/maint-4.0] Remove default obfs3 bridges #4 and #5, and scramblesuit bridge #1.
by gk＠torproject.org 28 Nov '14

28 Nov '14

commit d54502befc3bffef55541e9db18e3428d548cde1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 21 20:36:40 2014 +0000 Remove default obfs3 bridges #4 and #5, and scramblesuit bridge #1. These bridges were removed because: 1. They have never provided their bridge descriptors for metrics. See #13504: https://bugs.torproject.org/13504 2. They are either unreachable or unreliable. 2.a. The two obfs3 bridges are unreachable: Oct 21 20:25:53.000 [warn] Proxy Client: unable to connect to 209.141.36.236:45496 ("TTL expired") Oct 21 20:25:53.000 [warn] Proxy Client: unable to connect to 208.79.90.242:35658 ("TTL expired") 2.b. The scramblesuit bridge is rejecting connections: Oct 21 20:26:57.000 [warn] Proxy Client: unable to connect to 188.40.121.112:39707 ("Connection refused") * REMOVE default bridges obfs3.4, obfs3.5, and scramblesuit.1. * RENAME other bridges' preference names to keep the lists sequential. * FIXES part of #13504, sort of kind of. We still don't have historical metrics for these bridges for the period they were active. --- Bundle-Data/PTConfigs/bridge_prefs.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index d9c2049..20ec235 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -5,10 +5,8 @@ pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239"); pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); -pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); -pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); -pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); -pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); +pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); +pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); pref("extensions.torlauncher.default_bridge.flashproxy.2", "flashproxy 0.0.1.0:2"); @@ -26,9 +24,8 @@ pref("extensions.torlauncher.default_bridge.fte.6", "fte 128.105.214.163:8080 A1 pref("extensions.torlauncher.default_bridge.fte-ipv6.1", "fte [2001:49f0:d002:1::2]:80 B629B0B607C8AC9349B5646C24E9D242184F5B6E"); pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1::c]:80 2BD466989944867075E872310EBAD65BC88C8AEF"); -pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI"); -pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); -pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); +pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); +pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor/master] Fix a memory leak in rend_services_introduce
by nickm＠torproject.org 28 Nov '14

28 Nov '14

commit 0bfadbf4b91347eb29c4e7d1a5ccfe2f9c7fd021 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 27 23:24:03 2014 -0500 Fix a memory leak in rend_services_introduce This is CID 1256187 ; bug not in any released tor. --- src/or/rendservice.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index ead9f3f..26e5659 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3073,11 +3073,12 @@ rend_services_introduce(void) const or_options_t *options = get_options(); /* List of nodes we need to _exclude_ when choosing a new node to establish * an intro point to. */ - smartlist_t *exclude_nodes = smartlist_new(); + smartlist_t *exclude_nodes; if (!have_completed_a_circuit()) return; + exclude_nodes = smartlist_new(); now = time(NULL); for (i=0; i < smartlist_len(rend_service_list); ++i) {

1 0