- tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 04 Apr '12

04 Apr '12

commit f1e04539af001f2a342c09092eff2a9bd32f3c84 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 4 15:15:18 2012 +0000 Update translations for vidalia_help --- zh_CN/config.po | 9 +++++---- zh_CN/services.po | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/zh_CN/config.po b/zh_CN/config.po index e897119..17e5913 100644 --- a/zh_CN/config.po +++ b/zh_CN/config.po @@ -1,13 +1,14 @@ # # Translators: # Christopher Meng <cickumqt(a)gmail.com>, 2012. +# <hua5679(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2012-03-04 04:08+0000\n" -"Last-Translator: Christopher Meng <cickumqt(a)gmail.com>\n" +"PO-Revision-Date: 2012-04-04 14:53+0000\n" +"Last-Translator: zhenghua1991 <hua5679(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -126,12 +127,12 @@ msgstr "128.213.48.13:8080" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:83 msgid "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73" -msgstr "" +msgstr "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:86 msgid "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" -msgstr "" +msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 diff --git a/zh_CN/services.po b/zh_CN/services.po index d7e4d54..605ab65 100644 --- a/zh_CN/services.po +++ b/zh_CN/services.po @@ -244,5 +244,3 @@ msgid "" "client application if it's not a web service), and Tor does the rest for " "you. There is no need to specifically configure Tor for that." msgstr "" - -

1 0

[metrics-tasks/master] Commit graphing code for #3574.
by karsten＠torproject.org 04 Apr '12

04 Apr '12

commit b7a73f0ce0605e4d0f017cb0696cc924a75c986e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Apr 4 09:15:30 2012 +0200 Commit graphing code for #3574. Ticket is closed since 7 months now, just found the code on my disk. --- task-3574/.gitignore | 6 +++ task-3574/AggregatePerDay.java | 66 +++++++++++++++++++++++++++++++++++ task-3574/OneLinePerDescriptor.java | 20 ++++++++++ task-3574/README | 23 ++++++++++++ task-3574/eval.R | 12 ++++++ 5 files changed, 127 insertions(+), 0 deletions(-) diff --git a/task-3574/.gitignore b/task-3574/.gitignore new file mode 100644 index 0000000..fae3c24 --- /dev/null +++ b/task-3574/.gitignore @@ -0,0 +1,6 @@ +*.txt +extra-infos/ +*.csv +*.class +*.pdf + diff --git a/task-3574/AggregatePerDay.java b/task-3574/AggregatePerDay.java new file mode 100644 index 0000000..cf625a6 --- /dev/null +++ b/task-3574/AggregatePerDay.java @@ -0,0 +1,66 @@ +import java.io.*; +import java.text.*; +import java.util.*; +public class AggregatePerDay { + public static void main(String[] args) throws Exception { + SortedMap<String, long[]> byteHistory = new TreeMap<String, long[]>(); + BufferedReader br = new BufferedReader(new FileReader( + "bridge-bandwidth-histories-sorted.txt")); + String line; + SimpleDateFormat dateTimeFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + SimpleDateFormat dateFormat = new SimpleDateFormat( + "yyyy-MM-dd"); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + SimpleDateFormat timeFormat = new SimpleDateFormat( + "HH:mm:ss"); + timeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + while ((line = br.readLine()) != null) { + String[] parts = line.split(" "); + if (parts.length < 3) { + continue; + } + String fingerprint = parts[2]; + while (line.contains("-history")) { + line = line.substring(line.indexOf("-history") - 4); + boolean isReadHistory = line.startsWith("read"); + line = line.substring(5); + parts = line.split(" "); + if (parts.length >= 6 && parts[5].length() > 0 && !parts[5].contains("history")) { + String[] bytes = parts[5].split(","); + long intervalEnd = dateTimeFormat.parse(parts[1] + " " + parts[2]).getTime(); + for (int i = bytes.length - 1; i >= 0; i--) { + String key = fingerprint + "," + + dateFormat.format(intervalEnd) + + (isReadHistory ? ",read" : ",write"); + long timeIndex = timeFormat.parse( + dateTimeFormat.format(intervalEnd).split(" ")[1]).getTime() + / (15L * 60L * 1000L); + long value = Long.parseLong(bytes[i]); + if (!byteHistory.containsKey(key)) { + byteHistory.put(key, new long[96]); + } + byteHistory.get(key)[(int) timeIndex] = value + 1L; + intervalEnd -= 15L * 60L * 1000L; + } + } + } + } + br.close(); + BufferedWriter bw = new BufferedWriter(new FileWriter( + "bridge-bandwidth-per-day.csv")); + for (Map.Entry<String, long[]> e : byteHistory.entrySet()) { + long total = 0L, count = 0L; + for (long val : e.getValue()) { + if (val > 0L) { + total += val - 1L; + count += 1L; + } + } + bw.write(e.getKey() + "," + total + "," + count + "\n"); + } + bw.close(); + } +} + diff --git a/task-3574/OneLinePerDescriptor.java b/task-3574/OneLinePerDescriptor.java new file mode 100644 index 0000000..78c83b1 --- /dev/null +++ b/task-3574/OneLinePerDescriptor.java @@ -0,0 +1,20 @@ +import java.io.*; +public class OneLinePerDescriptor { + public static void main(String[] args) throws Exception { + BufferedReader br = new BufferedReader(new FileReader( + "bridge-bandwidth-histories-raw.txt")); + String line; + BufferedWriter bw = new BufferedWriter(new FileWriter( + "bridge-bandwidth-histories-by-fingerprint.txt")); + while ((line = br.readLine()) != null) { + if (line.startsWith("extra-info ")) { + bw.write("\n" + line); + } else { + bw.write(" " + line); + } + } + bw.close(); + br.close(); + } +} + diff --git a/task-3574/README b/task-3574/README new file mode 100644 index 0000000..0151eb4 --- /dev/null +++ b/task-3574/README @@ -0,0 +1,23 @@ +Extract bridge fingerprints and byte histories from extra-info +descriptors: + + $ grep -hRE "^extra-info|^write-history|^read-history" extra-infos > + bridge-bandwidth-histories-raw.txt + +Convert the output in something we can sort by fingerprint: + + $ javac OneLinePerDescriptor.java && java OneLinePerDescriptor + +Sort by fingerprint and filter out duplicates: + + $ sort bridge-bandwidth-histories-by-fingerprint.txt | uniq > + bridge-bandwidth-histories-sorted.txt + +Aggregate bytes per day: + + $ javac AggregatePerDay.java && java AggregatePerDay + +Plot graphs: + + $ R --slave -f eval.R + diff --git a/task-3574/eval.R b/task-3574/eval.R new file mode 100644 index 0000000..ac36880 --- /dev/null +++ b/task-3574/eval.R @@ -0,0 +1,12 @@ +library(ggplot2) +data <- read.csv("bridge-bandwidth-per-day.csv", stringsAsFactors = FALSE, col.names = c("fingerprint", "date", "operation", "bytes", "intervals")) +d <- aggregate(list(bytes = data$bytes, intervals = data$intervals), by = list(fingerprint = data$fingerprint), sum) +ggplot(d, aes(x = sort(bytes) / 2^30, y = (1:length(bytes)) / length(bytes))) + +geom_line() + +scale_x_continuous(name = "\nTotal read and written GiB per month", limits = c(0, 100)) + +scale_y_continuous(name = "Fraction of bridges\n", formatter = "percent", limits = c(0, 1)) +ggplot(d, aes(x = sort(bytes / intervals) / (15 * 60 * 2^10), y = (1:length(bytes)) / length(bytes))) + +geom_line() + +scale_x_continuous(name = "\nMean read and written KiB per second", limits = c(0, 10)) + +scale_y_continuous(name = "Fraction of bridges\n", formatter = "percent", limits = c(0, 1)) +

1 0

[atlas/master] Remove bad exit line from details page
by art＠torproject.org 04 Apr '12

04 Apr '12

commit 16564ce4cd2d6f62cfe7b23a4cc7d0ec156c45fe Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Apr 3 18:30:39 2012 -0700 Remove bad exit line from details page --- templates/details/main.html | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/templates/details/main.html b/templates/details/main.html index 52cd1cb..05dc5cc 100644 --- a/templates/details/main.html +++ b/templates/details/main.html @@ -56,9 +56,6 @@ <dt>Country</dt> <dd><%= relay.get('country') %></dd> - <dt>Bad Exit</dt> - <dd><%= relay.get('badexit') %></dd> - <dt>Last Restarted</dt> <dd><%= relay.get('last_restarted') %></dd>

1 0

[atlas/master] Properly convert time to UTC before doing calculation
by art＠torproject.org 04 Apr '12

04 Apr '12

commit 1d1d15fed03c226c7482e0310a23e28706edf9d2 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Apr 3 18:13:26 2012 -0700 Properly convert time to UTC before doing calculation Fixing #5318 --- js/models/relay.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/js/models/relay.js b/js/models/relay.js index ccefeec..8e9583d 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -60,6 +60,7 @@ define([ var utct = t[1].split(":"); var d = new Date(utcd[0], utcd[1]-1, utcd[2], utct[0], utct[1], utct[2]); var now = new Date(); + now = new Date(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), now.getUTCHours(), now.getUTCMinutes(), now.getUTCSeconds()); var diff = now-d; var secs = Math.round(diff/1000); var mins = Math.floor(secs/60);

1 0

[atlas/master] Avoid setting badexit model attribute to false when true
by art＠torproject.org 04 Apr '12

04 Apr '12

commit 43bd758af98811d3b22a5ce075a5bb65e9872e89 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Apr 3 14:16:51 2012 -0700 Avoid setting badexit model attribute to false when true --- js/models/relay.js | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/js/models/relay.js b/js/models/relay.js index 21eb6c2..ccefeec 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -19,8 +19,6 @@ define([ if (flag == "BadExit") { model.set({badexit: true}); output.push([flag, "denied_"+size[0]]); - } else { - model.set({badexit: false}); } if (flag == "Fast") { output.push([flag,"bolt_"+size[0]]); @@ -143,6 +141,7 @@ define([ relay.countryname = CountryCodes[relay.country]; relay.uptime = model.parsedate(relay.last_restarted); relay.uptime_hr = relay.uptime.hr; + model.set({badexit: false}); //console.log(relay.uptime.hrfull); relay.uptime_hrfull = relay.uptime.hrfull; relay.uptime = relay.uptime.millisecs;

1 0

[atlas/master] Merge branch 'master' of ssh://git-rw.torproject.org/atlas
by art＠torproject.org 04 Apr '12

04 Apr '12

commit 0e75a64069addab96cc518319d7f4cb71b53ad36 Merge: 43bd758 0adeedc Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Apr 3 17:12:50 2012 -0700 Merge branch 'master' of ssh://git-rw.torproject.org/atlas Conflicts: js/models/relay.js

1 0

[torbrowser/maint-2.2] fix debug line in osx launch script (closes: #4851)
by erinn＠torproject.org 03 Apr '12

03 Apr '12

commit 24ed18b2349cde7997e69c9c703229fd0b1f079e Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Apr 3 18:59:42 2012 -0300 fix debug line in osx launch script (closes: #4851) --- src/RelativeLink/RelativeLinkOSX.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLinkOSX.sh b/src/RelativeLink/RelativeLinkOSX.sh index 63ec4fb..817351f 100755 --- a/src/RelativeLink/RelativeLinkOSX.sh +++ b/src/RelativeLink/RelativeLinkOSX.sh @@ -53,7 +53,7 @@ if [ "$DEBUG_TBB" -eq 1 ]; then printf "\nStarting Vidalia now\n" cd "${HOME}" printf "\nLaunching Vidalia from: `pwd`\n" - ./Contents/MacOS/Vidalia --loglevel debug --logfile vidalia-debug-log \ + ./Contents/MacOS/Vidalia.app/Contents/MacOS/Vidalia --loglevel debug --logfile vidalia-debug-log \ --datadir ./Contents/Resources/Data/Vidalia/ printf "\nVidalia exited with the following return code: $?\n" exit

1 0

[torbrowser/maint-2.3] fix debug line in osx launch script (closes: #4851)
by erinn＠torproject.org 03 Apr '12

03 Apr '12

commit 24ed18b2349cde7997e69c9c703229fd0b1f079e Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Apr 3 18:59:42 2012 -0300 fix debug line in osx launch script (closes: #4851) --- src/RelativeLink/RelativeLinkOSX.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLinkOSX.sh b/src/RelativeLink/RelativeLinkOSX.sh index 63ec4fb..817351f 100755 --- a/src/RelativeLink/RelativeLinkOSX.sh +++ b/src/RelativeLink/RelativeLinkOSX.sh @@ -53,7 +53,7 @@ if [ "$DEBUG_TBB" -eq 1 ]; then printf "\nStarting Vidalia now\n" cd "${HOME}" printf "\nLaunching Vidalia from: `pwd`\n" - ./Contents/MacOS/Vidalia --loglevel debug --logfile vidalia-debug-log \ + ./Contents/MacOS/Vidalia.app/Contents/MacOS/Vidalia --loglevel debug --logfile vidalia-debug-log \ --datadir ./Contents/Resources/Data/Vidalia/ printf "\nVidalia exited with the following return code: $?\n" exit

1 0

[torbrowser/master] fix debug line in osx launch script (closes: #4851)
by erinn＠torproject.org 03 Apr '12

03 Apr '12

commit 24ed18b2349cde7997e69c9c703229fd0b1f079e Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Apr 3 18:59:42 2012 -0300 fix debug line in osx launch script (closes: #4851) --- src/RelativeLink/RelativeLinkOSX.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLinkOSX.sh b/src/RelativeLink/RelativeLinkOSX.sh index 63ec4fb..817351f 100755 --- a/src/RelativeLink/RelativeLinkOSX.sh +++ b/src/RelativeLink/RelativeLinkOSX.sh @@ -53,7 +53,7 @@ if [ "$DEBUG_TBB" -eq 1 ]; then printf "\nStarting Vidalia now\n" cd "${HOME}" printf "\nLaunching Vidalia from: `pwd`\n" - ./Contents/MacOS/Vidalia --loglevel debug --logfile vidalia-debug-log \ + ./Contents/MacOS/Vidalia.app/Contents/MacOS/Vidalia --loglevel debug --logfile vidalia-debug-log \ --datadir ./Contents/Resources/Data/Vidalia/ printf "\nVidalia exited with the following return code: $?\n" exit

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 03 Apr '12

03 Apr '12

commit edd91f582be790812320ab441097a44dad572585 Merge: 38a0675 24ed18b Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Apr 3 19:00:07 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 src/RelativeLink/RelativeLinkOSX.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0