- tor-commits - lists.torproject.org

r25148: {projects} add peninsulare (projects/misc-sysadmin)
by Andrew Lewman 04 Oct '11

04 Oct '11

Author: phobos Date: 2011-10-04 19:38:31 +0000 (Tue, 04 Oct 2011) New Revision: 25148 Modified: projects/misc-sysadmin/namelist Log: add peninsulare Modified: projects/misc-sysadmin/namelist =================================================================== --- projects/misc-sysadmin/namelist 2011-10-04 19:35:48 UTC (rev 25147) +++ projects/misc-sysadmin/namelist 2011-10-04 19:38:31 UTC (rev 25148) @@ -46,3 +46,4 @@ sewerzowi - 74.95.122.147 - 4GB - bwauth moly - 38.229.72.2 - 48GB - vm host moly - 2620:0:6b0:b:225:90ff:fe3b:ada8 +peninsulare - 38.229.72.5 - ipmi host

1 0

r25147: {projects} add moly. (projects/misc-sysadmin)
by Andrew Lewman 04 Oct '11

04 Oct '11

Author: phobos Date: 2011-10-04 19:35:48 +0000 (Tue, 04 Oct 2011) New Revision: 25147 Modified: projects/misc-sysadmin/namelist Log: add moly. Modified: projects/misc-sysadmin/namelist =================================================================== --- projects/misc-sysadmin/namelist 2011-10-02 07:42:56 UTC (rev 25146) +++ projects/misc-sysadmin/namelist 2011-10-04 19:35:48 UTC (rev 25147) @@ -44,3 +44,5 @@ tui-ipmi - 38.229.70.50 - - mgt card tui - 2620:0:6b0:b:225:90ff:fe0e:30fb sewerzowi - 74.95.122.147 - 4GB - bwauth +moly - 38.229.72.2 - 48GB - vm host +moly - 2620:0:6b0:b:225:90ff:fe3b:ada8

1 0

[torbrowser/maint-2.2] update windows version string to remove nonexistent arch type that causes trailing dash in torbrowser.version (closes: #4160)
by erinn＠torproject.org 04 Oct '11

04 Oct '11

commit 022c82c8b67f2ab63135fcd9368834af3f05dbbf Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 4 17:59:43 2011 +0100 update windows version string to remove nonexistent arch type that causes trailing dash in torbrowser.version (closes: #4160) --- build-scripts/windows.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8bfa747..1d9bd04 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -469,8 +469,8 @@ print-version: @echo $(RELEASE_VER)-$(BUILD_NUM) write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js ## Export the source code of the bundle SRCNAME=$(COMPRESSED_NAME)

1 0

[metrics-tasks/master] Add a graph for task 4142.
by karsten＠torproject.org 04 Oct '11

04 Oct '11

commit 16f6c8bf1c8acc4a9f190f34d1ae72acdf796b24 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Oct 4 17:50:50 2011 +0200 Add a graph for task 4142. --- task-4142/.gitignore | 6 ++++++ task-4142/Eval.java | 38 ++++++++++++++++++++++++++++++++++++++ task-4142/README | 5 +++++ task-4142/delay.R | 16 ++++++++++++++++ 4 files changed, 65 insertions(+), 0 deletions(-) diff --git a/task-4142/.gitignore b/task-4142/.gitignore new file mode 100644 index 0000000..0ec473e --- /dev/null +++ b/task-4142/.gitignore @@ -0,0 +1,6 @@ +*.class +*.pdf +delay +*.csv +*.png + diff --git a/task-4142/Eval.java b/task-4142/Eval.java new file mode 100644 index 0000000..ee021d0 --- /dev/null +++ b/task-4142/Eval.java @@ -0,0 +1,38 @@ +import java.io.*; +import java.util.*; +public class Eval { + public static void main(String[] args) throws Exception { + BufferedReader br = new BufferedReader(new FileReader("delay")); + String line, fingerprint = null, published = null; + Map<String, String> firstPublished = new HashMap<String, String>(); + while ((line = br.readLine()) != null) { + if (line.startsWith("extra-info ")) { + fingerprint = line.split(" ")[2]; + published = null; + } else if (line.startsWith("published ")) { + published = line.substring("published ".length()); + } else if (line.startsWith("dirreq-stats-end ")) { + String[] parts = line.split(" "); + String dirreqStatsEnd = parts[1] + " " + parts[2]; + String key = fingerprint + " " + dirreqStatsEnd; + if (!firstPublished.containsKey(key) || + firstPublished.get(key).compareTo(published) > 0) { + firstPublished.put(key, published); + } + } + } + br.close(); + BufferedWriter bw = new BufferedWriter(new FileWriter("delay.csv")); + bw.write("fingerprint,dirreqstatsend,published\n"); + for (Map.Entry<String, String> e : firstPublished.entrySet()) { + String[] parts = e.getKey().split(" "); + fingerprint = parts[0]; + String dirreqStatsEnd = parts[1] + " " + parts[2]; + published = e.getValue(); + bw.write(fingerprint + "," + dirreqStatsEnd + "," + published + + "\n"); + } + bw.close(); + } +} + diff --git a/task-4142/README b/task-4142/README new file mode 100644 index 0000000..5a25128 --- /dev/null +++ b/task-4142/README @@ -0,0 +1,5 @@ +$ grep -Rl "dirreq-stats-end" * | xargs -I{} grep -E \ + "published|dirreq-stats-end|^extra-info" {} > ../delay +$ javac Eval.java && java Eval +$ R --slave -f delay.R + diff --git a/task-4142/delay.R b/task-4142/delay.R new file mode 100644 index 0000000..5568e61 --- /dev/null +++ b/task-4142/delay.R @@ -0,0 +1,16 @@ +library(ggplot2) +d <- read.csv("delay.csv") +d <- data.frame(published = d$published, + dirreqstatsend = d$dirreqstatsend, + delay = as.POSIXlt(d$published) - as.POSIXlt(d$dirreqstatsend)) +m <- mean(as.numeric(d$delay)) / (60 * 60) +ggplot(d, aes(x = as.numeric(delay) / (60 * 60))) + +geom_histogram(binwidth = 1, fill = "purple2", + colour = alpha("white", 0.5)) + +scale_x_continuous(name = paste("\nDelay between finishing a", + "dirreq-stats interval and first publishing its results", + "(red line = mean value)"), minor_breaks = 1) + +scale_y_continuous(name = "Number of finished dirreq-stats intervals\n") + +geom_vline(xintercept = m, colour = "red", size = 1.5) + +ggsave("delay.png", width = 8, height = 5, dpi = 100) +

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 04 Oct '11

04 Oct '11

commit c7f8860e7089effd1a7370c75dcc26963d0109a4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 4 14:15:29 2011 +0000 Update translations for bridgedb --- ar/bridgedb.po | 1 + cs/bridgedb.po | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ar/bridgedb.po b/ar/bridgedb.po index b06f5d7..bc892c3 100644 --- a/ar/bridgedb.po +++ b/ar/bridgedb.po @@ -2,6 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # +# Translators: # allamiro <allamiro(a)gmail.com>, 2011. # mohammad Alhargan <malham1(a)gmail.com>, 2011. msgid "" diff --git a/cs/bridgedb.po b/cs/bridgedb.po index 31073be..2cef7f2 100644 --- a/cs/bridgedb.po +++ b/cs/bridgedb.po @@ -2,6 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # +# Translators: # Elisa <valhalla(a)gishpuppy.com>, 2011. msgid "" msgstr ""

1 0

[metrics-web/master] Don't consider relay-search queries for just a date as valid.
by karsten＠torproject.org 04 Oct '11

04 Oct '11

commit 6bcd7afa6395202c410384a1fa16400e86ca68e6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Oct 4 10:22:35 2011 +0200 Don't consider relay-search queries for just a date as valid. --- .../torproject/ernie/web/RelaySearchServlet.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/ernie/web/RelaySearchServlet.java b/src/org/torproject/ernie/web/RelaySearchServlet.java index 6e056f5..1791017 100644 --- a/src/org/torproject/ernie/web/RelaySearchServlet.java +++ b/src/org/torproject/ernie/web/RelaySearchServlet.java @@ -151,6 +151,7 @@ public class RelaySearchServlet extends HttpServlet { sb.append("."); } searchIPAddress = sb.toString().substring(1); + validQuery = true; } /* If the search term contains hyphens, it must be a month or a @@ -181,6 +182,7 @@ public class RelaySearchServlet extends HttpServlet { else if (searchTerm.length() >= 8 && searchTerm.length() <= 19 && hexPattern.matcher(searchTerm).matches()) { searchFingerprintOrNickname.add(searchTerm); + validQuery = true; } /* If the search term contains between 20 and 40 hex characters, @@ -192,6 +194,7 @@ public class RelaySearchServlet extends HttpServlet { break; } searchFingerprint = searchTerm; + validQuery = true; } /* If the search term contains up to 19 alphanumerical characters, @@ -203,6 +206,7 @@ public class RelaySearchServlet extends HttpServlet { break; } searchNickname = searchTerm; + validQuery = true; } /* We didn't recognize this search term. */ @@ -210,10 +214,6 @@ public class RelaySearchServlet extends HttpServlet { validQuery = false; break; } - - /* We recognized at least one search term, so that the query is - * potentially valid. */ - validQuery = true; } }

1 0

[metrics-web/master] Create stats/ directory in ExoneraTor db importer.
by karsten＠torproject.org 04 Oct '11

04 Oct '11

commit 2a2b195de0b80f057cafe10477bbb84e531c8340 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Oct 4 10:10:01 2011 +0200 Create stats/ directory in ExoneraTor db importer. --- .../ernie/cron/ExoneraTorDatabaseImporter.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java b/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java index 95d894b..c89097a 100755 --- a/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java +++ b/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java @@ -494,6 +494,7 @@ public class ExoneraTorDatabaseImporter { /* Write parse history from memory to disk for the next execution. */ private static void writeImportHistoryToDisk() { File parseHistoryFile = new File("stats/exonerator-import-history"); + parseHistoryFile.getParentFile().mkdirs(); try { BufferedWriter bw = new BufferedWriter(new FileWriter( parseHistoryFile));

1 0

[tor/master] Looks like Windows version 6.2 will be Windows 8
by nickm＠torproject.org 03 Oct '11

03 Oct '11

commit 103c861dfead6640a4bef6e85f740f7c635c7343 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Oct 1 14:44:39 2011 +0200 Looks like Windows version 6.2 will be Windows 8 Thanks to funkstar for the report --- changes/windows_8 | 5 +++++ src/common/compat.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/windows_8 b/changes/windows_8 new file mode 100644 index 0000000..405e4fa --- /dev/null +++ b/changes/windows_8 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - The next version of Windows will be called Windows 8, and it has a major + version of 6, minor version of 2. Correctly identify that version instead + of calling it "Very recent version". Fixes bug 4153; reported by funkstar. + diff --git a/src/common/compat.c b/src/common/compat.c index 80b4907..266fc61 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1806,6 +1806,7 @@ get_uname(void) static struct { unsigned major; unsigned minor; const char *version; } win_version_table[] = { + { 6, 2, "Windows 8" }, { 6, 1, "Windows 7" }, { 6, 0, "Windows Vista" }, { 5, 2, "Windows Server 2003" }, @@ -1862,7 +1863,7 @@ get_uname(void) plat, extra); } else { if (info.dwMajorVersion > 6 || - (info.dwMajorVersion==6 && info.dwMinorVersion>1)) + (info.dwMajorVersion==6 && info.dwMinorVersion>2)) tor_snprintf(uname_result, sizeof(uname_result), "Very recent version of Windows [major=%d,minor=%d] %s", (int)info.dwMajorVersion,(int)info.dwMinorVersion,

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 03 Oct '11

03 Oct '11

commit 2725a88d5e3ec362a4f866f53c26ca20f943eb49 Merge: 05f672c 103c861 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 3 15:19:00 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/windows_8 | 5 +++++ src/common/compat.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Looks like Windows version 6.2 will be Windows 8
by nickm＠torproject.org 03 Oct '11

03 Oct '11

commit 103c861dfead6640a4bef6e85f740f7c635c7343 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Oct 1 14:44:39 2011 +0200 Looks like Windows version 6.2 will be Windows 8 Thanks to funkstar for the report --- changes/windows_8 | 5 +++++ src/common/compat.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/windows_8 b/changes/windows_8 new file mode 100644 index 0000000..405e4fa --- /dev/null +++ b/changes/windows_8 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - The next version of Windows will be called Windows 8, and it has a major + version of 6, minor version of 2. Correctly identify that version instead + of calling it "Very recent version". Fixes bug 4153; reported by funkstar. + diff --git a/src/common/compat.c b/src/common/compat.c index 80b4907..266fc61 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1806,6 +1806,7 @@ get_uname(void) static struct { unsigned major; unsigned minor; const char *version; } win_version_table[] = { + { 6, 2, "Windows 8" }, { 6, 1, "Windows 7" }, { 6, 0, "Windows Vista" }, { 5, 2, "Windows Server 2003" }, @@ -1862,7 +1863,7 @@ get_uname(void) plat, extra); } else { if (info.dwMajorVersion > 6 || - (info.dwMajorVersion==6 && info.dwMinorVersion>1)) + (info.dwMajorVersion==6 && info.dwMinorVersion>2)) tor_snprintf(uname_result, sizeof(uname_result), "Very recent version of Windows [major=%d,minor=%d] %s", (int)info.dwMajorVersion,(int)info.dwMinorVersion,

1 0