March 2018 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-52.7.2esr-8.0-1] Orfox: top sites changed, used bookmarks icon temporarily.
by gk＠torproject.org 20 Mar '18

20 Mar '18

commit 65346d3b1e0aa0ef706a80b8860882121b6335d4 Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Thu Jun 18 04:14:18 2015 -0400 Orfox: top sites changed, used bookmarks icon temporarily. Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- .../drawable-hdpi/suggestedsites_checktor.png | Bin 0 -> 1286 bytes .../suggestedsites_guardianproject.png | Bin 0 -> 1286 bytes .../drawable-hdpi/suggestedsites_torproject.png | Bin 0 -> 1286 bytes .../drawable-mdpi/suggestedsites_checktor.png | Bin 0 -> 950 bytes .../drawable-mdpi/suggestedsites_facebook.png | Bin 0 -> 950 bytes .../suggestedsites_guardianproject.png | Bin 0 -> 950 bytes .../drawable-mdpi/suggestedsites_torproject.png | Bin 0 -> 950 bytes .../drawable-xhdpi/suggestedsites_checktor.png | Bin 0 -> 1626 bytes .../suggestedsites_guardianproject.png | Bin 0 -> 1626 bytes .../drawable-xhdpi/suggestedsites_torproject.png | Bin 0 -> 1626 bytes .../drawable-xxhdpi/suggestedsites_checktor.png | Bin 0 -> 1626 bytes .../suggestedsites_guardianproject.png | Bin 0 -> 1626 bytes .../drawable-xxhdpi/suggestedsites_torproject.png | Bin 0 -> 1626 bytes mobile/locales/en-US/chrome/region.properties | 71 +++++++-------------- 14 files changed, 24 insertions(+), 47 deletions(-) diff --git a/mobile/android/base/resources/drawable-hdpi/suggestedsites_checktor.png b/mobile/android/base/resources/drawable-hdpi/suggestedsites_checktor.png new file mode 100644 index 000000000000..a87c16e3d566 Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi/suggestedsites_checktor.png differ diff --git a/mobile/android/base/resources/drawable-hdpi/suggestedsites_guardianproject.png b/mobile/android/base/resources/drawable-hdpi/suggestedsites_guardianproject.png new file mode 100644 index 000000000000..a87c16e3d566 Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi/suggestedsites_guardianproject.png differ diff --git a/mobile/android/base/resources/drawable-hdpi/suggestedsites_torproject.png b/mobile/android/base/resources/drawable-hdpi/suggestedsites_torproject.png new file mode 100644 index 000000000000..a87c16e3d566 Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi/suggestedsites_torproject.png differ diff --git a/mobile/android/base/resources/drawable-mdpi/suggestedsites_checktor.png b/mobile/android/base/resources/drawable-mdpi/suggestedsites_checktor.png new file mode 100644 index 000000000000..c20ab864297a Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi/suggestedsites_checktor.png differ diff --git a/mobile/android/base/resources/drawable-mdpi/suggestedsites_facebook.png b/mobile/android/base/resources/drawable-mdpi/suggestedsites_facebook.png new file mode 100644 index 000000000000..c20ab864297a Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi/suggestedsites_facebook.png differ diff --git a/mobile/android/base/resources/drawable-mdpi/suggestedsites_guardianproject.png b/mobile/android/base/resources/drawable-mdpi/suggestedsites_guardianproject.png new file mode 100644 index 000000000000..c20ab864297a Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi/suggestedsites_guardianproject.png differ diff --git a/mobile/android/base/resources/drawable-mdpi/suggestedsites_torproject.png b/mobile/android/base/resources/drawable-mdpi/suggestedsites_torproject.png new file mode 100644 index 000000000000..c20ab864297a Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi/suggestedsites_torproject.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/suggestedsites_checktor.png b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_checktor.png new file mode 100644 index 000000000000..fa7f676310df Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_checktor.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/suggestedsites_guardianproject.png b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_guardianproject.png new file mode 100644 index 000000000000..fa7f676310df Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_guardianproject.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/suggestedsites_torproject.png b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_torproject.png new file mode 100644 index 000000000000..fa7f676310df Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_torproject.png differ diff --git a/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_checktor.png b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_checktor.png new file mode 100644 index 000000000000..fa7f676310df Binary files /dev/null and b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_checktor.png differ diff --git a/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_guardianproject.png b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_guardianproject.png new file mode 100644 index 000000000000..fa7f676310df Binary files /dev/null and b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_guardianproject.png differ diff --git a/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_torproject.png b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_torproject.png new file mode 100644 index 000000000000..fa7f676310df Binary files /dev/null and b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_torproject.png differ diff --git a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US/chrome/region.properties index 6d89a6f0fe75..201152118819 100644 --- a/mobile/locales/en-US/chrome/region.properties +++ b/mobile/locales/en-US/chrome/region.properties @@ -46,51 +46,28 @@ browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s # browser.suggestedsites.NAME.title=Displayed name # browser.suggestedsites.NAME.url=Website URL # browser.suggestedsites.NAME.bgcolor= Color (hex format) -# -# Note that if you remove or add items to this set, you need to adjust -# mobile/android/tests/browser/robocop/testDistribution.java -# to reflect the new set of IDs reported as tiles data. -# -browser.suggestedsites.list.0=facebook -browser.suggestedsites.list.1=youtube -browser.suggestedsites.list.2=amazon -browser.suggestedsites.list.3=wikipedia -browser.suggestedsites.list.4=twitter -browser.suggestedsites.facebook.title=Facebook -browser.suggestedsites.facebook.url=https://m.facebook.com/ -browser.suggestedsites.facebook.bgcolor=#385185 - -browser.suggestedsites.youtube.title=YouTube -browser.suggestedsites.youtube.url=https://m.youtube.com/ -browser.suggestedsites.youtube.bgcolor=#cd201f - -browser.suggestedsites.amazon.title=Amazon -browser.suggestedsites.amazon.url=https://www.amazon.com/ -browser.suggestedsites.amazon.bgcolor=#000000 - -browser.suggestedsites.wikipedia.title=Wikipedia -browser.suggestedsites.wikipedia.url=https://www.wikipedia.org/ -browser.suggestedsites.wikipedia.bgcolor=#000000 - -browser.suggestedsites.twitter.title=Twitter -browser.suggestedsites.twitter.url=https://mobile.twitter.com/ -browser.suggestedsites.twitter.bgcolor=#55acee - -browser.suggestedsites.restricted.list.0=restricted_fxsupport -browser.suggestedsites.restricted.list.1=webmaker -browser.suggestedsites.restricted.list.2=restricted_mozilla - -browser.suggestedsites.restricted_fxsupport.title=Firefox Help and Support for restricted profiles on Android tablets -browser.suggestedsites.restricted_fxsupport.url=https://support.mozilla.org/kb/controlledaccess -browser.suggestedsites.restricted_fxsupport.bgcolor=#f37c00 - -browser.suggestedsites.webmaker.title=Learn the Web: Mozilla Webmaker -browser.suggestedsites.webmaker.url=https://webmaker.org/ -browser.suggestedsites.webmaker.bgcolor=#f37c00 - -# LOCALIZATION NOTE: browser.suggestedsites.restricted_mozilla.url must be different from browser.suggestedsites.mozilla.url -browser.suggestedsites.restricted_mozilla.title=The Mozilla Project -browser.suggestedsites.restricted_mozilla.url=https://www.mozilla.org -browser.suggestedsites.restricted_mozilla.bgcolor=#ce4e41 -browser.suggestedsites.restricted_mozilla.trackingid=632 +browser.suggestedsites.list.0=checktor +browser.suggestedsites.list.1=torproject +browser.suggestedsites.list.2=guardianproject +browser.suggestedsites.list.3=facebook + +browser.suggestedsites.checktor.title=Check Tor Connection +browser.suggestedsites.checktor.url=https://check.torproject.org/ +browser.suggestedsites.checktor.bgcolor=#ffecf0f3 +browser.suggestedsites.checktor.trackingid=632 + +browser.suggestedsites.torproject.title=The Tor Project +browser.suggestedsites.torproject.url=https://www.torproject.org/ +browser.suggestedsites.torproject.bgcolor=#ffecf0f3 +browser.suggestedsites.torproject.trackingid=629 + +browser.suggestedsites.guardianproject.title=The Guardian Project +browser.suggestedsites.guardianproject.url=https://guardianproject.info/ +browser.suggestedsites.guardianproject.bgcolor=#ffecf0f3 +browser.suggestedsites.guardianproject.trackingid=630 + +browser.suggestedsites.facebook.title=Facebook Hidden Service +browser.suggestedsites.facebook.url=https://facebookcorewwwi.onion +browser.suggestedsites.facebook.bgcolor=#ffecf0f3 +browser.suggestedsites.facebook.trackingid=631

1 0

[tor-browser/tor-browser-52.7.2esr-8.0-1] Orfox: confvars changes to disable screen casting
by gk＠torproject.org 20 Mar '18

20 Mar '18

commit 36df808f70e1108b926a1187a03387d4b4823878 Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Wed Jun 10 17:12:02 2015 -0400 Orfox: confvars changes to disable screen casting Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- mobile/android/confvars.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index b4215ca89a0c..8af6925a6dc9 100644 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -32,6 +32,11 @@ MOZ_RAW=1 MOZ_RUST_MP4PARSE=1 +MOZ_PLACES= +MOZ_SOCIAL= +MOZ_ANDROID_HISTORY=0 +MOZ_DISABLE_EXPORT_JS=1 + # use custom widget for html:select MOZ_USE_NATIVE_POPUP_WINDOWS=1 @@ -40,7 +45,7 @@ MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110} MOZ_APP_STATIC_INI=1 # Enable second screen using native Android libraries. -MOZ_NATIVE_DEVICES=1 +MOZ_NATIVE_DEVICES=0 # Enable install tracking SDK if we have Google Play support; MOZ_NATIVE_DEVICES # is a proxy flag for that support.

1 0

[tor/master] Remove changes files already merged into 0.3.3
by nickm＠torproject.org 20 Mar '18

20 Mar '18

commit a08e18545abc8c195531dff78bf9aa5a838cff39 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 20 07:26:07 2018 -0400 Remove changes files already merged into 0.3.3 --- changes/bug25249 | 3 --- changes/bug25249.2 | 3 --- changes/bug25378 | 4 ---- changes/bug25450 | 8 -------- changes/bug25474 | 5 ----- changes/bug25479 | 4 ---- changes/geoip-2018-03-08 | 4 ---- changes/refactor23814 | 4 ---- changes/ticket23635 | 3 --- changes/trove-2018-001.1 | 6 ------ changes/trove-2018-004 | 8 -------- 11 files changed, 52 deletions(-) diff --git a/changes/bug25249 b/changes/bug25249 deleted file mode 100644 index b4153eeae..000000000 --- a/changes/bug25249 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (spec conformance): - - Forbid "-0" as a protocol version. Fixes part of bug 25249; bugfix on - 0.2.9.4-alpha. diff --git a/changes/bug25249.2 b/changes/bug25249.2 deleted file mode 100644 index 9058c1107..000000000 --- a/changes/bug25249.2 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (spec conformance): - - Forbid UINT32_MAX as a protocol version. Fixes part of bug 25249; - bugfix on 0.2.9.4-alpha. diff --git a/changes/bug25378 b/changes/bug25378 deleted file mode 100644 index 4648a0a31..000000000 --- a/changes/bug25378 +++ /dev/null @@ -1,4 +0,0 @@ - o Documentation: - - Update the documentation for "Log" to include the current list - of logging domains. Closes ticket 25378. - diff --git a/changes/bug25450 b/changes/bug25450 deleted file mode 100644 index ae14135a7..000000000 --- a/changes/bug25450 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes (testing): - - Avoid intermittent test failures due to relying on hidden service - introductory point creation within 5 seconds of real clock time. The - time limit for the test has been increased to 500 seconds, which may - still result in intermittent failures (e.g. if the system doing the - testing enters sleep/hibernation or experiences some other clock jump). - However, this should elliminate test failures currently happening on - developer and CI systems. Fixes bug 25450; bugfix on 0.3.1.3-alpha. diff --git a/changes/bug25474 b/changes/bug25474 deleted file mode 100644 index 7d3bd1c5f..000000000 --- a/changes/bug25474 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (compilation): - - Fix a c99 compliance issue in our configuration script that was - causing compilation issues when compiling Tor with certain - versions of xtools. Fixes bug 25474; bugfix on 0.3.2.5-alpha. - diff --git a/changes/bug25479 b/changes/bug25479 deleted file mode 100644 index e693b8ec7..000000000 --- a/changes/bug25479 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes (benchmarks): - - Fix a crash when running benchmark tests on win32 systems which - was due to an uninitialised mutex before logging and options - were initialised. Fixes bug 25479; bugfix on 0.3.3.3-alpha. diff --git a/changes/geoip-2018-03-08 b/changes/geoip-2018-03-08 deleted file mode 100644 index d9696aab5..000000000 --- a/changes/geoip-2018-03-08 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (geoip): - - Update geoip and geoip6 to the March 8 2018 Maxmind GeoLite2 - Country database. Closes ticket 25469. - diff --git a/changes/refactor23814 b/changes/refactor23814 deleted file mode 100644 index a67b6989f..000000000 --- a/changes/refactor23814 +++ /dev/null @@ -1,4 +0,0 @@ - o Code simplification and refactoring: - - Remove the old (deterministic) directory retry logic entirely: - We've used exponential backoff exclusively for some time. - Closes ticket 23814. diff --git a/changes/ticket23635 b/changes/ticket23635 deleted file mode 100644 index 54d303e4b..000000000 --- a/changes/ticket23635 +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation: - - Improved the documentation of AccountingStart paremeter. - Closes ticket 23635. diff --git a/changes/trove-2018-001.1 b/changes/trove-2018-001.1 deleted file mode 100644 index f0ee92f40..000000000 --- a/changes/trove-2018-001.1 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes (denial-of-service, directory authority): - - Fix a protocol-list handling bug that could be used to remotely crash - directory authorities with a null-pointer exception. Fixes bug 25074; - bugfix on 0.2.9.4-alpha. Also tracked as TROVE-2018-001. - - diff --git a/changes/trove-2018-004 b/changes/trove-2018-004 deleted file mode 100644 index 37e0a89b0..000000000 --- a/changes/trove-2018-004 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes (denial-of-service): - - Fix a possible crash on malformed consensus. If a consensus had - contained an unparseable protocol line, it could have made clients - and relays crash with a null-pointer exception. To exploit this - issue, however, an attacker would need to be able to subvert the - directory-authority system. Fixes bug 25251; bugfix on - 0.2.9.4-alpha. Also tracked as TROVE-2018-004. -

1 0

[webwml/master] Deprecate Tor Browser 8.0a3
by gk＠torproject.org 20 Mar '18

20 Mar '18

commit c9cd4e2e1103c71cc10e30357518f2244f8d7a19 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 20 10:23:14 2018 +0000 Deprecate Tor Browser 8.0a3 --- projects/torbrowser/RecommendedTBBVersions | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 0d1e187e..2d65a840 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,10 +3,6 @@ "7.5.2-MacOS", "7.5.2-Linux", "7.5.2-Windows", -"8.0a3", -"8.0a3-MacOS", -"8.0a3-Linux", -"8.0a3-Windows", "8.0a4", "8.0a4-MacOS", "8.0a4-Linux",

1 0

[tor/master] Move rust-specific declarations outside of #else block
by nickm＠torproject.org 20 Mar '18

20 Mar '18

commit 228b65593533a796243853f53109049ebc2b4efa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 19 19:18:23 2018 -0400 Move rust-specific declarations outside of #else block These declarations need to exist unconditionally, but they were trapped inside an "#else /* !(defined(HAVE_SYSLOG_H)) */" block. Fixes a travis regression caused by 23881; bug not in any released tor. --- src/common/torlog.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/common/torlog.h b/src/common/torlog.h index a8b5604d8..ac632ff52 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -31,16 +31,6 @@ * "maximum severity" read "most severe" and "numerically *lowest* severity". */ -/** This defines log levels that are linked in the Rust log module, rather - * than re-defining these in both Rust and C. - * - * C_RUST_COUPLED src/rust/tor_log LogSeverity, LogDomain - */ -extern const int LOG_WARN_; -extern const int LOG_NOTICE_; -extern const log_domain_mask_t LD_NET_; -extern const log_domain_mask_t LD_GENERAL_; - /** Debug-level severity: for hyper-verbose messages of no interest to * anybody but developers. */ #define LOG_DEBUG 7 @@ -262,6 +252,16 @@ void tor_log_string(int severity, log_domain_mask_t domain, args, ##__VA_ARGS__) #endif /* defined(__GNUC__) && __GNUC__ <= 3 */ +/** This defines log levels that are linked in the Rust log module, rather + * than re-defining these in both Rust and C. + * + * C_RUST_COUPLED src/rust/tor_log LogSeverity, LogDomain + */ +extern const int LOG_WARN_; +extern const int LOG_NOTICE_; +extern const log_domain_mask_t LD_NET_; +extern const log_domain_mask_t LD_GENERAL_; + #ifdef LOG_PRIVATE MOCK_DECL(STATIC void, logv, (int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format,

1 0

[metrics-web/master] Cut off lower number of expected clients at 0.
by karsten＠torproject.org 20 Mar '18

20 Mar '18

commit 5d039ad44c10cd82dd9ba8fb1efd6a7caa9b6090 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 12 17:33:47 2018 +0100 Cut off lower number of expected clients at 0. Fixes #25397. --- src/main/python/clients/detector.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/python/clients/detector.py b/src/main/python/clients/detector.py index 611f25b..6cf1c7d 100644 --- a/src/main/python/clients/detector.py +++ b/src/main/python/clients/detector.py @@ -363,6 +363,8 @@ def write_all(tss, minc, maxc, RANGES_FILE, INTERVAL=7): if not minv < maxv: print minv, maxv, series[i-INTERVAL], minc[i], maxc[i] assert minv < maxv + if minv < 0.0: + minv = 0.0 ranges_file.write("%s,%s,%s,%s\n" % (tss.all_dates[i], c, minv, maxv)) ranges_file.close()

1 0

[metrics-web/master] Remove unused code from the censorship detector.
by karsten＠torproject.org 20 Mar '18

20 Mar '18

commit 4a30e7a9fbdded5318506302543b5d5e07571670 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 12 17:49:40 2018 +0100 Remove unused code from the censorship detector. --- src/main/python/clients/detector.py | 199 +----------------------------------- 1 file changed, 2 insertions(+), 197 deletions(-) diff --git a/src/main/python/clients/detector.py b/src/main/python/clients/detector.py index 6cf1c7d..3d17bf0 100644 --- a/src/main/python/clients/detector.py +++ b/src/main/python/clients/detector.py @@ -60,8 +60,6 @@ import country_info # write utf8 to file import codecs -days = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"] - def get_country_name_from_cc(country_code): if (country_code.lower() in country_info.countries): return country_info.countries[country_code.lower()] @@ -208,145 +206,6 @@ def make_tendencies_minmax(l, INTERVAL = 1): ## print minx[-1], maxx[-1] return minx, maxx -# Makes pretty plots -def raw_plot(series, minc, maxc, labels, xtitle): - assert len(xtitle) == 3 - fname, stitle, slegend = xtitle - - font = {'family' : 'Bitstream Vera Sans', - 'weight' : 'normal', - 'size' : 8} - matplotlib.rc('font', **font) - - ylim( (-max(series)*0.1, max(series)*1.1) ) - plot(labels, series, linewidth=1.0, label="Users") - - wherefill = [] - for mm,mx in zip(minc, maxc): - wherefill += [not (mm == None and mx == None)] - assert mm < mx or (mm == None and mx == None) - - fill_between(labels, minc, maxc, where=wherefill, color="gray", label="Prediction") - - vdown = [] - vup = [] - for i,v in enumerate(series): - if minc[i] != None and v < minc[i]: - vdown += [v] - vup += [None] - elif maxc[i] != None and v > maxc[i]: - vdown += [None] - vup += [v] - else: - vup += [None] - vdown += [None] - - plot(labels, vdown, 'o', ms=10, lw=2, alpha=0.5, mfc='orange', label="Downturns") - plot(labels, vup, 'o', ms=10, lw=2, alpha=0.5, mfc='green', label="Upturns") - - legend(loc=2) - - xlabel('Time (days)') - ylabel('Users') - title(stitle) - grid(True) - F = gcf() - - F.set_size_inches(10,5) - F.savefig(fname, format="png", dpi = (150)) - close() - -def absolute_plot(series, minc, maxc, labels,INTERVAL, xtitle): - in_minc = [] - in_maxc = [] - for i, v in enumerate(series): - if i > 0 and i - INTERVAL >= 0 and series[i] != None and series[i-INTERVAL] != None and series[i-INTERVAL] != 0 and minc[i]!= None and maxc[i]!= None: - in_minc += [minc[i] * poisson.ppf(1-0.9999, series[i-INTERVAL])] - in_maxc += [maxc[i] * poisson.ppf(0.9999, series[i-INTERVAL])] - if not in_minc[-1] < in_maxc[-1]: - print in_minc[-1], in_maxc[-1], series[i-INTERVAL], minc[i], maxc[i] - assert in_minc[-1] < in_maxc[-1] - else: - in_minc += [None] - in_maxc += [None] - raw_plot(series, in_minc, in_maxc, labels, xtitle) - -"""Return the number of downscores and upscores of a time series -'series', given tendencies 'minc' and 'maxc' for the time interval -'INTERVAL'. - -If 'scoring_interval' is specifed we only consider upscore/downscore -that happened in the latest 'scoring_interval' days. -""" -def censor_score(series, minc, maxc, INTERVAL, scoring_interval=None): - upscore = 0 - downscore = 0 - - if scoring_interval is None: - scoring_interval = len(series) - assert(len(series) >= scoring_interval) - - for i, v in enumerate(series): - if i > 0 and i - INTERVAL >= 0 and series[i] != None and series[i-INTERVAL] != None and series[i-INTERVAL] != 0 and minc[i]!= None and maxc[i]!= None: - in_minc = minc[i] * poisson.ppf(1-0.9999, series[i-INTERVAL]) - in_maxc = maxc[i] * poisson.ppf(0.9999, series[i-INTERVAL]) - if (i >= (len(series) - scoring_interval)): - downscore += 1 if minc[i] != None and v < in_minc else 0 - upscore += 1 if maxc[i] != None and v > in_maxc else 0 - - return downscore, upscore - -def plot_target(tss, TARGET, xtitle, minx, maxx, DAYS=365, INTERV = 7): - ctarget = tss.get_country_series(TARGET) - c = n_day_rel(ctarget, INTERV) - absolute_plot(ctarget[-DAYS:], minx[-DAYS:], maxx[-DAYS:], tss.all_dates[-DAYS:],INTERV, xtitle = xtitle) - -def write_censorship_report_prologue(report_file, dates, notification_period): - if (notification_period == 1): - date_str = "%s" % (dates[-1]) # no need for date range if it's just one day - else: - date_str = "%s to %s" % (dates[-notification_period], dates[-1]) - - prologue = "=======================\n" - prologue += "Automatic Censorship Report for %s\n" % (date_str) - prologue += "=======================\n\n" - report_file.write(prologue) - -## Make a league table of censorship + nice graphs -def plot_all(tss, minx, maxx, INTERV, DAYS=None, rdir="img"): - rdir = os.path.realpath(rdir) - if not os.path.exists(rdir) or not os.path.isdir(rdir): - print "ERROR: %s does not exist or is not a directory." % rdir - return - - summary_file = file(os.path.join(rdir, "summary.txt"), "w") - - if DAYS == None: - DAYS = 6*31 - - s = tss.get_largest(200) - scores = [] - for num, li in s: - print ".", - ds,us = censor_score(tss.get_country_series(li)[-DAYS:], minx[-DAYS:], maxx[-DAYS:], INTERV) - # print ds, us - scores += [(ds,num, us, li)] - scores.sort() - scores.reverse() - s = "\n=======================\n" - s+= "Report for %s to %s\n" % (tss.all_dates[-DAYS], tss.all_dates[-1]) - s+= "=======================\n" - print s - summary_file.write(s) - for a,nx, b,c in scores: - if a > 0: - s = "%s -- down: %2d (up: %2d affected: %s)" % (c, a, b, nx) - print s - summary_file.write(s + "\n") - xtitle = (os.path.join(rdir, "%03d-%s-censor.png" % (a,c)), "Tor report for %s -- down: %2d (up: %2d affected: %s)" % (c, a, b, nx),"") - plot_target(tss, c,xtitle, minx, maxx, DAYS, INTERV) - summary_file.close() - """Write a CSV report on the minimum/maximum users of each country per date.""" def write_all(tss, minc, maxc, RANGES_FILE, INTERVAL=7): ranges_file = file(RANGES_FILE, "w") @@ -368,70 +227,16 @@ def write_all(tss, minc, maxc, RANGES_FILE, INTERVAL=7): ranges_file.write("%s,%s,%s,%s\n" % (tss.all_dates[i], c, minv, maxv)) ranges_file.close() -"""Return a URL that points to a graph in metrics.tpo that displays -the number of direct Tor users in country 'country_code', for a -'period'-days period. - -Let's hope that the metrics.tpo URL scheme doesn't change often. -""" -def get_tor_usage_graph_url_for_cc_and_date(country_code, dates, period): - url = "https://metrics.torproject.org/users.html?graph=userstats-relay-country&sta…" % \ - (dates[-period], dates[-1], country_code) - return url - -"""Write a file containing a short censorship report over the last -'notification_period' days. -""" -def write_ml_report(tss, minx, maxx, INTERV, DAYS, notification_period=None): - if notification_period is None: - notification_period = DAYS - - report_file = codecs.open('short_censorship_report.txt', 'w', 'utf-8') - file_prologue_written = False - - s = tss.get_largest(None) # no restrictions, get 'em all. - scores = [] - for num, li in s: - ds,us = censor_score(tss.get_country_series(li)[-DAYS:], minx[-DAYS:], maxx[-DAYS:], INTERV, notification_period) - scores += [(ds,num, us, li)] - scores.sort() - scores.reverse() - - for downscores,users_n,upscores,country_code in scores: - if (downscores > 0) or (upscores > 0): - if not file_prologue_written: - write_censorship_report_prologue(report_file, tss.all_dates, notification_period) - file_prologue_written = True - - if ((upscores > 0) and (downscores == 0)): - s = "We detected an unusual spike of Tor users in %s (%d upscores, %d users):\n" % \ - (get_country_name_from_cc(country_code), upscores, users_n) - else: - s = "We detected %d potential censorship events in %s (users: %d, upscores: %d):\n" % \ - (downscores, get_country_name_from_cc(country_code), users_n, upscores) - - # Also give out a link for the appropriate usage graph for a 90-days period. - s += get_tor_usage_graph_url_for_cc_and_date(country_code, tss.all_dates, 90) - - report_file.write(s + "\n") - - report_file.close() - # INTERV is the time interval to model connection rates; # consider maximum DAYS days back. def detect(CSV_FILE = "userstats-detector.csv", - RANGES_FILE = "userstats-ranges.csv", GRAPH_DIR = "img", - INTERV = 7, DAYS = 6 * 31, REPORT = True): + RANGES_FILE = "userstats-ranges.csv", + INTERV = 7, DAYS = 6 * 31): tss = torstatstore(CSV_FILE) l = tss.get_largest_locations(50) minx, maxx = make_tendencies_minmax(l, INTERV) - #plot_all(tss, minx, maxx, INTERV, DAYS, rdir=GRAPH_DIR) write_all(tss, minx, maxx, RANGES_FILE, INTERV) - if REPORT: - # Make our short report; only consider events of the last day - write_ml_report(tss, minx, maxx, INTERV, DAYS, 1) - def main(): detect()

1 0

[metrics-web/master] Update to latest metrics-lib.
by karsten＠torproject.org 20 Mar '18

20 Mar '18

commit 08b646bb16142f627a0ce804fce1722bdd272096 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Mar 20 10:31:55 2018 +0100 Update to latest metrics-lib. --- src/submods/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submods/metrics-lib b/src/submods/metrics-lib index 7648780..2e235ef 160000 --- a/src/submods/metrics-lib +++ b/src/submods/metrics-lib @@ -1 +1 @@ -Subproject commit 7648780844f809f3068d3e625973fe43c78ccbb3 +Subproject commit 2e235ef8f38aac679817fa8e8b9171aadb3d5b9d

1 0

[collector/master] Corrected description of vote descriptor path.
by karsten＠torproject.org 20 Mar '18

20 Mar '18

commit 770f55cf82a1281e5081de7731adc9e36a916622 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Feb 26 15:24:50 2018 +0000 Corrected description of vote descriptor path. Implements task-20287. --- src/main/resources/docs/PROTOCOL | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/docs/PROTOCOL b/src/main/resources/docs/PROTOCOL index c84c286..2c8b603 100644 --- a/src/main/resources/docs/PROTOCOL +++ b/src/main/resources/docs/PROTOCOL @@ -209,7 +209,8 @@ Where VOTE is the string "vote" and all time related values are derived from the valid-after dates. 'fingerprint' is the fingerprint of the authority and 'digest' is the SHA1 - digest of the authority's medium term signing key. + digest for the vote document, i.e., the digest of the descriptor + bytes from the start of the vote to the 'directory-signature'. 4.3.4 'microdescs' contains the subfolders

1 0

[tor/master] Add minimal implementations of functions Rust needs for logging
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 719db28f54ad1fa957999f2a6256e07bdb412e4f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 20 16:52:55 2017 -0500 Add minimal implementations of functions Rust needs for logging --- src/common/log.c | 24 ++++++++++++++++++++++++ src/common/torlog.h | 4 ++++ 2 files changed, 28 insertions(+) diff --git a/src/common/log.c b/src/common/log.c index ac6d07a92..608ffea95 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -225,6 +225,30 @@ log_set_application_name(const char *name) appname = name ? tor_strdup(name) : NULL; } +/** Return true if some of the running logs might be interested in a log + * message of the given severity in the given domains. If this function + * returns true, the log message might be ignored anyway, but if it returns + * false, it is definitely_ safe not to log the message. */ +int +log_message_is_interesting(int severity, log_domain_mask_t domain) +{ + (void) domain; + return (severity <= log_global_min_severity_); +} + +/** + * As tor_log, but takes an optional function name, and does not treat its + * <b>string</b> as a printf format. + * + * For use by Rust integration. + */ +void +tor_log_string(int severity, log_domain_mask_t domain, + const char *function, const char *string) +{ + log_fn_(severity, domain, function, "%s", string); +} + /** Log time granularity in milliseconds. */ static int log_time_granularity = 1; diff --git a/src/common/torlog.h b/src/common/torlog.h index b7d033adb..be8a39a1b 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -189,6 +189,10 @@ void log_fn_ratelim_(struct ratelim_t *ratelim, int severity, const char *format, ...) CHECK_PRINTF(5,6); +int log_message_is_interesting(int severity, log_domain_mask_t domain); +void tor_log_string(int severity, log_domain_mask_t domain, + const char *function, const char *string); + #if defined(__GNUC__) && __GNUC__ <= 3 /* These are the GCC varidaic macros, so that older versions of GCC don't

1 0