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

[webwml/master] Deprecate old Tor Browser version
by gk＠torproject.org 06 Jul '17

06 Jul '17

commit 62c26abcfb38a51f0665914f6ad0cc626f6d20af Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 6 12:28:35 2017 +0000 Deprecate old Tor Browser version --- projects/torbrowser/RecommendedTBBVersions | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index a1df7e0..ca1b2b0 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -1,8 +1,4 @@ [ -"7.0.1", -"7.0.1-Linux", -"7.0.1-MacOS", -"7.0.1-Windows", "7.0.2", "7.0.2-Linux", "7.0.2-MacOS",

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 06 Jul '17

06 Jul '17

commit ccbf9c96a833c012129990f9b27e56364248a583 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 6 10:21:35 2017 +0000 Update translations for tor-browser-manual --- it/it.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/it.po b/it/it.po index d0d3bcc..f844cbb 100644 --- a/it/it.po +++ b/it/it.po @@ -1,7 +1,7 @@ # Translators: # Fandor <fandor(a)riseup.net>, 2016 # Francesca Ciceri <madamezou(a)zouish.org>, 2016 -# Sebastiano Pistore <olatusrooc(a)virgilio.it>, 2016 +# Sebastiano Pistore <SebastianoPistore.info(a)protonmail.ch>, 2016 # paolo buratti <>, 2016 # fetidyoo <tru74368(a)yahoo.com>, 2016 # Gabriele <ravo_1986(a)hotmail.com>, 2016

1 0

[sandboxed-tor-browser/master] Bug 22829: Remove default obfs4 bridge riemann.
by yawning＠torproject.org 06 Jul '17

06 Jul '17

commit 2f82b3f210b4b0ed945a73052151c401624799ef Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Jul 6 02:36:21 2017 +0000 Bug 22829: Remove default obfs4 bridge riemann. --- ChangeLog | 1 + data/bridges.json | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bc73fbd..8cd3858 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ Changes in version 0.0.10 - UNRELEASED: + * Bug 22829: Remove default obfs4 bridge riemann. Changes in version 0.0.9 - 2017-07-03: * Bug 22712: Suppress ATK Bridge initialization which will never work. diff --git a/data/bridges.json b/data/bridges.json index 358476f..fa73eed 100644 --- a/data/bridges.json +++ b/data/bridges.json @@ -8,7 +8,6 @@ ], "obfs4": [ "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0", - "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1", "obfs4 83.212.101.3:50002 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0",

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 06 Jul '17

06 Jul '17

commit 68a2c75ab7ff74df2cf770d7f10427b71d942301 Merge: 93bd60e 9919638 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 17:37:14 2017 -0400 Merge branch 'maint-0.3.1' src/or/networkstatus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Fix a wide line from 22207
by nickm＠torproject.org 06 Jul '17

06 Jul '17

commit 9919638e98000b14982810db28e3f37fd1106bc9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 17:37:06 2017 -0400 Fix a wide line from 22207 --- src/or/networkstatus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 3bbe636..25d7913 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2312,7 +2312,8 @@ networkstatus_dump_bridge_status_to_file(time_t now) char fingerprint[FINGERPRINT_LEN+1]; char *fingerprint_line = NULL; - if (me && crypto_pk_get_fingerprint(me->identity_pkey, fingerprint, 0) >= 0) { + if (me && crypto_pk_get_fingerprint(me->identity_pkey, + fingerprint, 0) >= 0) { tor_asprintf(&fingerprint_line, "fingerprint %s\n", fingerprint); } else { log_warn(LD_BUG, "Error computing fingerprint for bridge status.");

1 0

[tor/master] Fix a wide line from 22207
by nickm＠torproject.org 06 Jul '17

06 Jul '17

commit 9919638e98000b14982810db28e3f37fd1106bc9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 17:37:06 2017 -0400 Fix a wide line from 22207 --- src/or/networkstatus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 3bbe636..25d7913 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2312,7 +2312,8 @@ networkstatus_dump_bridge_status_to_file(time_t now) char fingerprint[FINGERPRINT_LEN+1]; char *fingerprint_line = NULL; - if (me && crypto_pk_get_fingerprint(me->identity_pkey, fingerprint, 0) >= 0) { + if (me && crypto_pk_get_fingerprint(me->identity_pkey, + fingerprint, 0) >= 0) { tor_asprintf(&fingerprint_line, "fingerprint %s\n", fingerprint); } else { log_warn(LD_BUG, "Error computing fingerprint for bridge status.");

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 06 Jul '17

06 Jul '17

commit f6a36996dbe31b813e52bd32959db2d1e35b012a Merge: 0203000 9919638 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 17:37:14 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/or/networkstatus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Fix a wide line from 22207
by nickm＠torproject.org 06 Jul '17

06 Jul '17

commit 9919638e98000b14982810db28e3f37fd1106bc9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 17:37:06 2017 -0400 Fix a wide line from 22207 --- src/or/networkstatus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 3bbe636..25d7913 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2312,7 +2312,8 @@ networkstatus_dump_bridge_status_to_file(time_t now) char fingerprint[FINGERPRINT_LEN+1]; char *fingerprint_line = NULL; - if (me && crypto_pk_get_fingerprint(me->identity_pkey, fingerprint, 0) >= 0) { + if (me && crypto_pk_get_fingerprint(me->identity_pkey, + fingerprint, 0) >= 0) { tor_asprintf(&fingerprint_line, "fingerprint %s\n", fingerprint); } else { log_warn(LD_BUG, "Error computing fingerprint for bridge status.");

1 0

[tor/maint-0.3.1] Merge remote-tracking branch 'karsten/task-22207' into maint-0.3.1
by nickm＠torproject.org 06 Jul '17

06 Jul '17

commit 2251667ff239d508be6b01a59a47d0c235da2465 Merge: 15b1357 5b5e20a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 17:00:43 2017 -0400 Merge remote-tracking branch 'karsten/task-22207' into maint-0.3.1 changes/task-22207 | 4 ++++ src/or/networkstatus.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/master] Add "fingerprint" line to bridge network status.
by nickm＠torproject.org 06 Jul '17

06 Jul '17

commit 5b5e20a478e7c151f78b8c905a2b8470a7a159be Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jun 11 09:53:16 2017 +0200 Add "fingerprint" line to bridge network status. Implements #22207. --- changes/task-22207 | 4 ++++ src/or/networkstatus.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/changes/task-22207 b/changes/task-22207 new file mode 100644 index 0000000..6354483 --- /dev/null +++ b/changes/task-22207 @@ -0,0 +1,4 @@ + o Minor features: + - Add "fingerprint" line to networkstatus-bridges produced by + bridge authorities. Implements #22207. + diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index fffd107..3bbe636 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2308,13 +2308,22 @@ networkstatus_dump_bridge_status_to_file(time_t now) char *thresholds = NULL; char *published_thresholds_and_status = NULL; char published[ISO_TIME_LEN+1]; + const routerinfo_t *me = router_get_my_routerinfo(); + char fingerprint[FINGERPRINT_LEN+1]; + char *fingerprint_line = NULL; + if (me && crypto_pk_get_fingerprint(me->identity_pkey, fingerprint, 0) >= 0) { + tor_asprintf(&fingerprint_line, "fingerprint %s\n", fingerprint); + } else { + log_warn(LD_BUG, "Error computing fingerprint for bridge status."); + } format_iso_time(published, now); dirserv_compute_bridge_flag_thresholds(); thresholds = dirserv_get_flag_thresholds_line(); tor_asprintf(&published_thresholds_and_status, - "published %s\nflag-thresholds %s\n%s", - published, thresholds, status); + "published %s\nflag-thresholds %s\n%s%s", + published, thresholds, fingerprint_line ? fingerprint_line : "", + status); tor_asprintf(&fname, "%s"PATH_SEPARATOR"networkstatus-bridges", options->DataDirectory); write_str_to_file(fname,published_thresholds_and_status,0); @@ -2322,6 +2331,7 @@ networkstatus_dump_bridge_status_to_file(time_t now) tor_free(published_thresholds_and_status); tor_free(fname); tor_free(status); + tor_free(fingerprint_line); } /* DOCDOC get_net_param_from_list */

1 0