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

[policies/master] Nicer notice when dateutil is missing
by atagar＠torproject.org 05 Oct '17

05 Oct '17

commit 68d2b48ac39610297cd7f4331f69f80afca82308 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 4 16:54:25 2017 -0700 Nicer notice when dateutil is missing Only dependency we have outside of builtins. Providing a nicer error when it's unavailable. --- scripts/email_activity.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/email_activity.py b/scripts/email_activity.py index 70f1e4f..8359796 100644 --- a/scripts/email_activity.py +++ b/scripts/email_activity.py @@ -1,9 +1,14 @@ import collections +import datetime import re import urllib +import sys -from datetime import date -from dateutil import relativedelta # https://pypi.python.org/pypi/python-dateutil/ +try: + from dateutil import relativedelta +except ImportError: + print("dateutil unavailable, please run 'sudo pip install python-dateutil'") + sys.exit(1) EMAIL_LISTS = ( 'tor-talk', @@ -30,7 +35,7 @@ for email_list in EMAIL_LISTS: all_list_authors = [] for month_offset in range(6): - d = date.today() - relativedelta.relativedelta(months = month_offset) + d = datetime.date.today() - relativedelta.relativedelta(months = month_offset) url = "https://lists.torproject.org/pipermail/%s/%s/author.html" % (email_list, d.strftime("%Y-%B")) request = urllib.urlopen(url)

1 0

[policies/master] Script to provide irc activity
by atagar＠torproject.org 05 Oct '17

05 Oct '17

commit f752aa8a0e3245e53c84b38949515778cfbcd4cd Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Oct 5 11:49:45 2017 -0700 Script to provide irc activity --- scripts/irc_activity.py | 104 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/scripts/irc_activity.py b/scripts/irc_activity.py new file mode 100644 index 0000000..4b405ba --- /dev/null +++ b/scripts/irc_activity.py @@ -0,0 +1,104 @@ +import calendar +import collections +import datetime +import os +import re +import sys + +try: + from dateutil import relativedelta +except ImportError: + print("dateutil unavailable, please run 'sudo pip install python-dateutil'") + sys.exit(1) + +IRC_CHANNELS = ( + '#tor', + '#tor-project', + '#tor-dev', + '#tor-internal', +) + +AUTHOR = re.compile('^[0-9]{2}:[0-9]{2} <.(\S+)>') +DATE_LINE = re.compile('^--- Day changed [\S]{3} [\S]{3} [0-9]{2} [0-9]{4}$') +START_DATE = datetime.date.today() - relativedelta.relativedelta(months = 6) +LOG_DIR = sys.argv[1] if len(sys.argv) >= 2 else None + +if not LOG_DIR: + print("Please provide the path of the irc log directory to read.") + sys.exit(1) +elif not os.path.exists(LOG_DIR): + print("%s doesn't exist" % LOG_DIR) + sys.exit(1) +elif not os.path.isdir(LOG_DIR): + print("%s isn't a directory" % LOG_DIR) + sys.exit(1) + +for channel in IRC_CHANNELS: + log_path = os.path.join(LOG_DIR, channel) + '.log' + + if not os.path.exists(log_path): + print("%s doesn't exist" % log_path) + sys.exit(1) + + +def latest_date_line(log_path): + # gets the closest date header to what we're looking for + + datelines, closest_date = set(), START_DATE + + with open(log_path) as log_file: + for line in log_file: + if DATE_LINE.match(line): + datelines.add(line.strip()) + + while True: + month = closest_date.strftime("%B")[:3] + day_of_week = calendar.day_name[closest_date.weekday()][:3] + dateline = closest_date.strftime("--- Day changed %%s %%s %d %Y") % (day_of_week, month) + + if dateline in datelines: + return dateline + elif closest_date > datetime.date.today(): + return None + + closest_date += relativedelta.relativedelta(days = 1) + + +all_authorship = [] +messages_for_channel = {} # {author => {channel => count}} + +for channel in IRC_CHANNELS: + log_path = os.path.join(LOG_DIR, channel) + '.log' + date_line = latest_date_line(log_path) + all_channel_authors = [] + + if not date_line: + print('unable to find a date line to start reading from for %s' % log_path) + sys.exit(1) + + with open(log_path) as log_file: + reached_date = False + + for line in log_file: + if not reached_date: + if line.strip() == date_line: + reached_date = True + + continue # prior to what we should take into consideration + + m = AUTHOR.match(line) + + if m: + author = m.group(1) + all_authorship.append(author) + all_channel_authors.append(author) + + for author, count in collections.Counter(all_channel_authors).items(): + messages_for_channel.setdefault(author, {})[channel] = count + +for author, count in sorted(collections.Counter(all_authorship).items(), key = lambda entry: entry[1], reverse = True): + channel_counts = ['%s %s' % (c, a) for (a, c) in sorted(messages_for_channel.get(author, {}).items(), key = lambda e: e[1], reverse = True)] + + print('%s %s' % (count, author)) + print(' %s' % ', '.join(channel_counts)) +

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 05 Oct '17

05 Oct '17

commit f3493cbac212e92287b985bc426455e212b5bf71 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 5 18:17:42 2017 +0000 Update translations for torbutton-torbuttonproperties --- ga/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ga/torbutton.properties b/ga/torbutton.properties index 3f2ccf590..49c3f9968 100644 --- a/ga/torbutton.properties +++ b/ga/torbutton.properties @@ -21,7 +21,7 @@ torbutton.popup.dontask = Automatically download files from now on torbutton.popup.prompted_language = Is féidir leis an gcnaipe Tor an leagan Béarla de leathanaigh Ghréasáin a iarraidh, chun tuilleadh príobháideachais a thabhairt duit. Leis seo i bhfeidhm, seans go bhfaighidh tú an leagan Béarla de leathanaigh dhátheangacha ab fhearr leat a léamh i nGaeilge.\n\nAn bhfuil fonn ort leaganacha Béarla a iarraidh mar sin féin? torbutton.popup.no_newnym = Níl an cnaipe Tor in ann aitheantas nua a thabhairt duit go sábháilte. Níl sé in ann teacht ar Phort Rialaithe Tor.\n\nAn bhfuil tú ag úsáid Burla Brabhsálaí Tor? torbutton.title.prompt_torbrowser = Eolas Tábhachtach faoi Chnaipe Tor -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. +torbutton.popup.prompt_torbrowser = Feidhmíonn an cnaipe Tor go difriúil anois; ní féidir leat é a mhúchadh a thuilleadh.\n\nD'athraíomar é seo toisc nach bhfuil sé sábháilte an cnaipe Tor a úsáid i mbrabhsálaí a úsáidtear le brabhsáil lasmuigh de Tor. Bhí an iomarca fabhtanna ann nach rabhamar in ann deisiú ar aon bhealach eile.\n\nMás mian leat leanúint ar aghaidh le Firefox mar is gnáth, ba chóir duit an cnaipe Tor a dhíshuiteáil agus Brabhsálaí Tor a íoslódáil. Tá na hairíonna slándála i mBrabhsálaí Tor i bhfad níos fearr ná na cinn i ngnáth-Firefox, fiú nuair a úsáidtear Firefox leis an gcnaipe Tor.\n\nChun an cnaipe Tor a bhaint, oscail Uirlisí->Breiseáin->Eisínteachtaí ansin cliceáil an cnaipe Bain in aice le Cnaipe Tor. torbutton.popup.short_torbrowser = Eolas Tábhachtach maidir leis an gCnaipe Tor!\n\nTá an Cnaipe Tor cumasaithe i gcónaí.\n\nCliceáil air chun tuilleadh eolais a fháil. torbutton.popup.confirm_plugins = Is féidir le forlíontáin ar nós Flash dochar a dhéanamh do do phríobháideachas agus d'aitheantas a nochtadh ar líne.\n\nTá siad in ann Tor a sheachaint agus an áit ina bhfuil tú agus do sheoladh IP a nochtadh.\n\nAn bhfuil tú cinnte gur mhaith leat forlíontáin a chumasú?\n\n

1 0

[metrics-base/master] Make build revision properties file project-specific.
by karsten＠torproject.org 05 Oct '17

05 Oct '17

commit 78e533fdc84e20769a8a155d1426cbea59c6e7cc Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Jul 3 09:15:20 2017 +0000 Make build revision properties file project-specific. --- java/base.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/base.xml b/java/base.xml index bfd19f8..64f8ac7 100644 --- a/java/base.xml +++ b/java/base.xml @@ -233,8 +233,8 @@ </patternset> <patternset id="empty" excludes="*"/> <target name="jar" depends="compile,docs,gitrev" > - <propertyfile file="${classes}/build.properties" > - <entry key="build.revision" + <propertyfile file="${classes}/${name}.buildrevision.properties" > + <entry key="${name}.build.revision" value="${git.revision}" /> </propertyfile> <property name="manifestattributes" value="${generated}/additional" />

1 0

[tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 05 Oct '17

05 Oct '17

commit 558eafe56e0d3fd0d769a330cecc9f02f85aa8a6 Merge: e2979ebe2 2e21493a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:04:59 2017 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/geoip-october2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.2.9] add missing subcategory in changes file
by nickm＠torproject.org 05 Oct '17

05 Oct '17

commit 2e21493a88c264e2df91078c3f14f269854755ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:04:54 2017 -0400 add missing subcategory in changes file --- changes/geoip-october2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip-october2017 b/changes/geoip-october2017 index 547f2ccfd..11f623e85 100644 --- a/changes/geoip-october2017 +++ b/changes/geoip-october2017 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (geoip): - Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2 Country database.

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 05 Oct '17

05 Oct '17

commit 7a4741c2336341449212f635672102d5ba391276 Merge: bdf60fc7c f7f55acae Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:04:59 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-october2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 05 Oct '17

05 Oct '17

commit f7f55acae96c391767fec94f8a1932b5d4645897 Merge: ad7db1077 43ebe54a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:04:59 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-october2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 05 Oct '17

05 Oct '17

commit 91c17ffbd61348e63cac81e90583f0b22b3c17d4 Merge: d6bdec159 2e21493a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:04:59 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/geoip-october2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 05 Oct '17

05 Oct '17

commit bad224df85236956708183ff00d0d6bd94dc46ae Merge: adec001c9 91c17ffbd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 5 11:04:59 2017 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/geoip-october2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0