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

[webwml/staging] add ED
by sebastian＠torproject.org 12 Jul '15

12 Jul '15

commit b0cd5fb5bd72706be7dcef844f704119b2d9d752 Author: Wendy Seltzer <wseltzer(a)w3.org> Date: Sun Jul 12 09:14:25 2015 -0400 add ED --- about/en/jobs.wml | 3 ++- about/en/sidenav.wmi | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/about/en/jobs.wml b/about/en/jobs.wml index e63ede7..a6f36b7 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -19,7 +19,8 @@ <p>Specifically, we're looking for the following people currently: </p> <ul> -<a href="<page about/jobs-execadmin>">Executive Administrator</a></li> +<li><a href="http://data01.wentco.com/openreq/Requisition.aspx?ReqID=67528129">Executive Director</a> (<a href="https://blog.torproject.org/blog/tor-project-launches-world-wide-search-new…">blog post</a>)</li> +<li><a href="<page about/jobs-execadmin>">Executive Administrator</a></li> </ul> <p>In the past, we looked for the following people:</p> diff --git a/about/en/sidenav.wmi b/about/en/sidenav.wmi index a5a1d24..7fff063 100644 --- a/about/en/sidenav.wmi +++ b/about/en/sidenav.wmi @@ -44,6 +44,9 @@ {'url' => 'about/jobs', 'txt' => 'Jobs', 'subelements' => [ + {'url' => 'http://data01.wentco.com/openreq/Requisition.aspx?ReqID=67528129',, + 'txt' => 'Executive Director', + }, {'url' => 'about/jobs-execadmin', 'txt' => 'Exec administrator', }]

1 0

[metrics-lib/master] Minor buffering improvements.
by karsten＠torproject.org 12 Jul '15

12 Jul '15

commit 2237e8935c307e21b8f0652e65a89c63ca939991 Author: leeroy <ter.one.leeboi(a)hush.com> Date: Sat Jul 11 17:54:07 2015 -0400 Minor buffering improvements. --- .../descriptor/impl/DescriptorCollectorImpl.java | 12 +++++++----- .../torproject/descriptor/impl/DirectoryDownloader.java | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DescriptorCollectorImpl.java b/src/org/torproject/descriptor/impl/DescriptorCollectorImpl.java index 5373b9d..8b5f2ca 100644 --- a/src/org/torproject/descriptor/impl/DescriptorCollectorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorCollectorImpl.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import java.io.BufferedOutputStream; import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.File; @@ -194,7 +195,8 @@ public class DescriptorCollectorImpl implements DescriptorCollector { destinationDirectory.mkdirs(); File tempDestinationFile = new File(destinationDirectory, "." + destinationFile.getName()); - FileOutputStream fos = new FileOutputStream(tempDestinationFile); + BufferedOutputStream bos = new BufferedOutputStream( + new FileOutputStream(tempDestinationFile)); URL u = new URL(url); huc = (HttpURLConnection) u.openConnection(); huc.setRequestMethod("GET"); @@ -213,12 +215,12 @@ public class DescriptorCollectorImpl implements DescriptorCollector { } BufferedInputStream bis = new BufferedInputStream(is); int len; - byte[] data = new byte[1024]; - while ((len = bis.read(data, 0, 1024)) >= 0) { - fos.write(data, 0, len); + byte[] data = new byte[8192]; + while ((len = bis.read(data, 0, 8192)) >= 0) { + bos.write(data, 0, len); } bis.close(); - fos.close(); + bos.close(); tempDestinationFile.renameTo(destinationFile); destinationFile.setLastModified(lastModifiedMillis); } diff --git a/src/org/torproject/descriptor/impl/DirectoryDownloader.java b/src/org/torproject/descriptor/impl/DirectoryDownloader.java index 4266217..66af559 100644 --- a/src/org/torproject/descriptor/impl/DirectoryDownloader.java +++ b/src/org/torproject/descriptor/impl/DirectoryDownloader.java @@ -73,8 +73,8 @@ public class DirectoryDownloader implements Runnable { new InflaterInputStream(huc.getInputStream())); ByteArrayOutputStream baos = new ByteArrayOutputStream(); int len; - byte[] data = new byte[1024]; - while ((len = in.read(data, 0, 1024)) >= 0) { + byte[] data = new byte[8192]; + while ((len = in.read(data, 0, 8192)) >= 0) { baos.write(data, 0, len); } in.close();

1 0

[tor/master] note some dead code in set_max_file_descriptors
by nickm＠torproject.org 11 Jul '15

11 Jul '15

commit de397d57c9ea06ca3e0bba13f393cd9208611cb7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jul 11 16:53:32 2015 -0400 note some dead code in set_max_file_descriptors --- src/common/compat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/common/compat.c b/src/common/compat.c index 34f6ea2..9d01c9d 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1642,6 +1642,9 @@ set_max_file_descriptors(rlim_t limit, int *max_out) return -1; } if (limit == 0) { + /* XXXX DEAD CODE We can't reach this point, since the first "if" in this + * function increases limit if it started out less than ULIMIT_BUFFER */ + /* If limit == 0, return the maximum value without setting it. */ limit = rlim.rlim_max; if (limit > INT_MAX)

1 0

[tor/master] Fix a leak in test_microdesc (CID 1311631)
by nickm＠torproject.org 11 Jul '15

11 Jul '15

commit 8507d75c8231a3af372beb0c695af078b4e27a7b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jul 11 16:47:21 2015 -0400 Fix a leak in test_microdesc (CID 1311631) --- src/test/test_microdesc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index a4b9a0c..b205eff 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -834,10 +834,10 @@ test_md_corrupt_desc(void *arg) cp, cp+strlen(cp), SAVED_IN_JOURNAL, 0, time(NULL), NULL); tt_int_op(smartlist_len(sl), ==, 0); - smartlist_free(sl); done: tor_free(cp); + smartlist_free(sl); } struct testcase_t microdesc_tests[] = {

1 0

[metrics-lib/master] Prevent blocking after an exception.
by karsten＠torproject.org 11 Jul '15

11 Jul '15

commit ca0cf734c5dfc1b40bd23014bd4c13cf089ab871 Author: leeroy <ter.one.leeboi(a)hush.com> Date: Fri Jul 10 20:26:56 2015 -0400 Prevent blocking after an exception. --- .../descriptor/impl/DescriptorCollectorImpl.java | 12 ++++++++++-- .../torproject/descriptor/impl/DirectoryDownloader.java | 7 +++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DescriptorCollectorImpl.java b/src/org/torproject/descriptor/impl/DescriptorCollectorImpl.java index e5f2f9c..5373b9d 100644 --- a/src/org/torproject/descriptor/impl/DescriptorCollectorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorCollectorImpl.java @@ -112,9 +112,10 @@ public class DescriptorCollectorImpl implements DescriptorCollector { String fetchRemoteDirectory(String url) { StringBuilder sb = new StringBuilder(); + HttpURLConnection huc = null; try { URL u = new URL(url); - HttpURLConnection huc = (HttpURLConnection) u.openConnection(); + huc = (HttpURLConnection) u.openConnection(); huc.setRequestMethod("GET"); huc.connect(); int responseCode = huc.getResponseCode(); @@ -129,6 +130,9 @@ public class DescriptorCollectorImpl implements DescriptorCollector { } } catch (IOException e) { e.printStackTrace(); + if (huc != null) { + huc.disconnect(); + } return ""; } return sb.toString(); @@ -184,6 +188,7 @@ public class DescriptorCollectorImpl implements DescriptorCollector { void fetchRemoteFile(String url, File destinationFile, long lastModifiedMillis) { + HttpURLConnection huc = null; try { File destinationDirectory = destinationFile.getParentFile(); destinationDirectory.mkdirs(); @@ -191,7 +196,7 @@ public class DescriptorCollectorImpl implements DescriptorCollector { + destinationFile.getName()); FileOutputStream fos = new FileOutputStream(tempDestinationFile); URL u = new URL(url); - HttpURLConnection huc = (HttpURLConnection) u.openConnection(); + huc = (HttpURLConnection) u.openConnection(); huc.setRequestMethod("GET"); if (!url.endsWith(".xz")) { huc.addRequestProperty("Accept-Encoding", "gzip"); @@ -219,6 +224,9 @@ public class DescriptorCollectorImpl implements DescriptorCollector { } } catch (IOException e) { e.printStackTrace(); + if (huc != null) { + huc.disconnect(); + } } } diff --git a/src/org/torproject/descriptor/impl/DirectoryDownloader.java b/src/org/torproject/descriptor/impl/DirectoryDownloader.java index f10fc83..4266217 100644 --- a/src/org/torproject/descriptor/impl/DirectoryDownloader.java +++ b/src/org/torproject/descriptor/impl/DirectoryDownloader.java @@ -58,10 +58,10 @@ public class DirectoryDownloader implements Runnable { String url = "http://" + this.ipPort + request.getRequestedResource(); request.setRequestStart(System.currentTimeMillis()); + HttpURLConnection huc = null; try { URL u = new URL(url); - HttpURLConnection huc = - (HttpURLConnection) u.openConnection(); + huc = (HttpURLConnection) u.openConnection(); huc.setConnectTimeout((int) this.connectTimeout); huc.setReadTimeout((int) this.readTimeout); huc.setRequestMethod("GET"); @@ -86,6 +86,9 @@ public class DirectoryDownloader implements Runnable { } } catch (Exception e) { request.setException(e); + if (huc != null) { + huc.disconnect(); + } /* Stop downloading from this directory if there are any * problems, e.g., refused connections. */ keepRunning = false;

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 10 Jul '15

10 Jul '15

commit cb8c5c023f0e349f30fd6a539437d76358b8b87a Merge: efae1bc e5907e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 25 11:42:31 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-june2015 | 3 + src/config/geoip |14347 +++++++++++++++++++++++------------------------- 2 files changed, 6999 insertions(+), 7351 deletions(-)

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4
by nickm＠torproject.org 10 Jul '15

10 Jul '15

commit fde4199e1caa094965da0904955ad34748db1e30 Merge: cb8c5c0 08e14e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 25 11:42:47 2015 -0400 Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4 changes/geoip6-june2015 | 3 + src/config/geoip6 | 2282 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 1561 insertions(+), 724 deletions(-)

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 10 Jul '15

10 Jul '15

commit fd082c394bf392cab0c586313a82d5bb3bbd6139 Merge: 75388f6 fde4199 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 25 11:43:04 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/geoip-june2015 | 3 + changes/geoip6-june2015 | 3 + src/config/geoip |14347 +++++++++++++++++++++++------------------------ src/config/geoip6 | 2282 +++++--- 4 files changed, 8560 insertions(+), 8075 deletions(-)

1 0

[tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6
by nickm＠torproject.org 10 Jul '15

10 Jul '15

commit 2cdef2bb3417b4561559d7dab46165c220405c78 Merge: 23a9598 418b6f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 10 11:54:49 2015 -0400 Merge branch 'maint-0.2.6' into release-0.2.6 changes/geoip-june2015 | 3 + changes/geoip6-june2015 | 3 + src/config/geoip |14347 +++++++++++++++++++++++------------------------ src/config/geoip6 | 2282 +++++--- 4 files changed, 8560 insertions(+), 8075 deletions(-)

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 10 Jul '15

10 Jul '15

commit 418b6f8197929aaf7c532d68bd7e11aefcacaded Merge: 1c1d71f fd082c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 25 11:43:17 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/geoip-june2015 | 3 + changes/geoip6-june2015 | 3 + src/config/geoip |14347 +++++++++++++++++++++++------------------------ src/config/geoip6 | 2282 +++++--- 4 files changed, 8560 insertions(+), 8075 deletions(-)

1 0