- tor-commits - lists.torproject.org

[orbot/master] updated
by n8fr8＠torproject.org 27 Jan '12

27 Jan '12

commit ac9ef0805c0f19a827aea779e68e953021d032fb Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 21:14:15 2012 -0500 updated --- CHANGELOG | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a8cb421..043536e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ 1.0.7 +- reduced data folder size by making geoip file only installed on demand +- added options for turning of persistent notification - enabled access to localhost ports for SOCKS, HTTP, etc even when transproxy is on - improved handling of tor and privoxy binary upgrades - updated openssl to 1.0.0f to address recent SSLv3 threat

1 0

[orbot/master] added ant build script and proguard opt
by n8fr8＠torproject.org 27 Jan '12

27 Jan '12

commit e91e34ede24515c00deb2aadfbfc35431cc7db2d Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 27 11:00:07 2012 -0500 added ant build script and proguard opt --- add-proguard-release.xml | 46 ++++++++++++++++++++++++ build.xml | 88 ++++++++++++++++++++++++++++++++++++++++++++++ procfg.txt | 31 ++++++++++++++++ 3 files changed, 165 insertions(+), 0 deletions(-) diff --git a/add-proguard-release.xml b/add-proguard-release.xml new file mode 100644 index 0000000..aaf2ffb --- /dev/null +++ b/add-proguard-release.xml @@ -0,0 +1,46 @@ + +<property name="obfuscate.dir" value="obf" /> +<property name="obfuscate.absolute.dir" location="${obfuscate.dir}" /> +<property name="android-jar-preobfuscate" value="${obfuscate.absolute.dir}/original.jar" /> +<property name="android-jar-postobfuscate" value="${obfuscate.absolute.dir}/postobf.jar" /> +<property name="out.dex.input.absolute.dir" value="${android-jar-postobfuscate}" /> + + +<target name="-post-compile" depends="-dex-obfuscate,-dex-no-obfuscate"> +</target> + +<target name="-dex-no-obfuscate" unless="build.mode.release"> + <mkdir dir="${obfuscate.absolute.dir}" /> + <jar basedir="${out.dir}/classes" destfile="${android-jar-postobfuscate}" /> +</target> + + +<target name="-dex-obfuscate" if="build.mode.release"> + <property name="proguard-jar" value="${proguard.dir}/proguard.jar" /> + <property name="proguard-conf.dir" value="" /> + <property name="proguard-conf.absolute.dir" location="${proguard-conf.dir}" /> + <property name="proguard-conf" value="${proguard-conf.absolute.dir}/procfg.txt" /> + <path id="fullclasspath"> + <path refid="android.target.classpath"/> + <pathelement path="${external.libs.dir}"/> + </path> + <property name="libraryjarpath" refid="fullclasspath"/> +  + <taskdef resource="proguard/ant/task.properties" classpath="${proguard-jar}" /> + + <mkdir dir="${obfuscate.absolute.dir}" /> + <delete file="${android-jar-preobfuscate}"/> + <delete file="${android-jar-postobfuscate}"/> + <jar basedir="${out.classes.dir}" destfile="${android-jar-preobfuscate}" /> + <proguard> + @${proguard-conf} + -injars ${android-jar-preobfuscate} + -outjars ${android-jar-postobfuscate} + -libraryjars ${libraryjarpath} + -dump ${obfuscate.absolute.dir}/dump.txt + -printseeds ${obfuscate.absolute.dir}/seeds.txt + -printusage ${obfuscate.absolute.dir}/usage.txt + -printmapping ${obfuscate.absolute.dir}/mapping.txt + </proguard> +</target> + diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..27a1ea4 --- /dev/null +++ b/build.xml @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE project [ + <!ENTITY add-proguard-release SYSTEM "add-proguard-release.xml"> +]> +<project name="Orbot" default="help"> +  + <loadproperties srcFile="local.properties" /> + +  + <property file="ant.properties" /> + +  + <loadproperties srcFile="project.properties" /> + +  + <fail + message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'" + unless="sdk.dir" + /> + + + + + +  +  + <import file="${sdk.dir}/tools/ant/build.xml" /> + +&add-proguard-release; +</project> diff --git a/procfg.txt b/procfg.txt new file mode 100644 index 0000000..b9dab40 --- /dev/null +++ b/procfg.txt @@ -0,0 +1,31 @@ +-optimizationpasses 5 +-dontusemixedcaseclassnames +-dontskipnonpubliclibraryclasses +-dontpreverify +-verbose +-optimizations !code/simplification/arithmetic,!field/*,!class/merging/* + +-keep public class * extends android.app.Activity +-keep public class * extends android.app.Application +-keep public class * extends android.app.Service +-keep public class * extends android.content.BroadcastReceiver +-keep public class * extends android.content.ContentProvider +-keep public class com.android.vending.licensing.ILicensingService + +-keepclasseswithmembernames class * { + native <methods>; +} + +-keepclasseswithmembernames class * { + public <init>(android.content.Context, android.util.AttributeSet); +} + +-keepclasseswithmembernames class * { + public <init>(android.content.Context, android.util.AttributeSet, int); +} + +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} +

1 0

[orbot/master] updated to 1.0.7-FINAL
by n8fr8＠torproject.org 27 Jan '12

27 Jan '12

commit 9c4e6757491128962800b6565deaee81e8c264f4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 27 11:00:18 2012 -0500 updated to 1.0.7-FINAL --- AndroidManifest.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3055147..0e2e1b2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.3.10-alpha-orbot-1.0.7-RC7" + android:versionName="0.2.3.10-alpha-orbot-1.0.7-FINAL" android:versionCode="31" android:installLocation="auto" >

1 0

[orbot/master] adding project properties files
by n8fr8＠torproject.org 27 Jan '12

27 Jan '12

commit a73d8eea294a2b2c0302c69cbc596469f59566a8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 27 11:01:32 2012 -0500 adding project properties files --- default.properties | 1 + project.properties | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/default.properties b/default.properties new file mode 100644 index 0000000..fd4c7f0 --- /dev/null +++ b/default.properties @@ -0,0 +1 @@ +proguard.config=proguard.cfg diff --git a/project.properties b/project.properties new file mode 100644 index 0000000..ea89160 --- /dev/null +++ b/project.properties @@ -0,0 +1,11 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-8

1 0

[orbot/master] updated to build version 32
by n8fr8＠torproject.org 27 Jan '12

27 Jan '12

commit 7b035dfad75c425598cbcdcadb968b49cd4486ac Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 27 11:00:42 2012 -0500 updated to build version 32 --- AndroidManifest.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0e2e1b2..060cc4e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" android:versionName="0.2.3.10-alpha-orbot-1.0.7-FINAL" - android:versionCode="31" + android:versionCode="32" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" />

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 27 Jan '12

27 Jan '12

commit 40f9a39421925e986d9fee071cde807ef52e362e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 27 15:45:04 2012 +0000 Update translations for bridgedb --- ca/bridgedb.po | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/ca/bridgedb.po b/ca/bridgedb.po new file mode 100644 index 0000000..94c3f83 --- /dev/null +++ b/ca/bridgedb.po @@ -0,0 +1,81 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Toni Hermoso Pulido <toniher(a)softcatala.cat>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-01-01 07:48-0800\n" +"PO-Revision-Date: 2012-01-27 15:44+0000\n" +"Last-Translator: Toni Hermoso Pulido <toniher(a)softcatala.cat>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#: lib/bridgedb/I18n.py:21 +msgid "Here are your bridge relays: " +msgstr "" + +#: lib/bridgedb/I18n.py:23 +msgid "" +"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" +"in the main directory. Since there is no complete public list of them,\n" +"even if your ISP is filtering connections to all the known Tor relays,\n" +"they probably won't be able to block all the bridges." +msgstr "" + +#: lib/bridgedb/I18n.py:28 +msgid "" +"To use the above lines, go to Vidalia's Network settings page, and click\n" +"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" +"address one at a time." +msgstr "" + +#: lib/bridgedb/I18n.py:32 +msgid "" +"Configuring more than one bridge address will make your Tor connection\n" +"more stable, in case some of the bridges become unreachable." +msgstr "" +"Configurar més d'una adreça de pont farà que la vostra connexió Tor sigui " +"més estable en cas que no es pugui contactar amb alguns dels ponts." + +#: lib/bridgedb/I18n.py:35 +msgid "" +"Another way to find public bridge addresses is to send mail to\n" +"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" +"of the mail. However, so we can make it harder for an attacker to learn\n" +"lots of bridge addresses, you must send this request from an email address at\n" +"one of the following domains:" +msgstr "" + +#: lib/bridgedb/I18n.py:41 +msgid "[This is an automated message; please do not reply.]" +msgstr "[Això és un missatge automàtic; no el respongueu.]" + +#: lib/bridgedb/I18n.py:43 +msgid "" +"Another way to find public bridge addresses is to visit\n" +"https://bridges.torproject.org/. The answers you get from that page\n" +"will change every few days, so check back periodically if you need more\n" +"bridge addresses." +msgstr "" +"Una altra forma de trobar adreces pont és visitar " +"https://bridges.torproject.org/. Les adreces que obteniu de la pàgina " +"canviaran cada pocs dies. Per tant, comproveu-la periòdicament si necessiteu" +" més adreces pont." + +#: lib/bridgedb/I18n.py:48 +msgid "(no bridges currently available)" +msgstr "(no hi ha cap pont actualment)" + +#: lib/bridgedb/I18n.py:50 +msgid "(e-mail requests not currently supported)" +msgstr "(ara mateix no s'accepten sol·licituds per correu electrònic)" + +

1 0

[metrics-web/master] Change an Ant target name.
by karsten＠torproject.org 27 Jan '12

27 Jan '12

commit 79c24bbe373272575ba313d7354c24c294602e5d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 27 11:43:35 2012 +0100 Change an Ant target name. --- build.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.xml b/build.xml index e148a13..8f57532 100644 --- a/build.xml +++ b/build.xml @@ -81,7 +81,7 @@ </target>  - <target name="make-war" + <target name="war" depends="compile"> <war destfile="${warfile}" webxml="${webxmlfile}">

1 0

[metrics-db/master] Move compiled Java classes from bin/ to classes/.
by karsten＠torproject.org 27 Jan '12

27 Jan '12

commit fe5e7a0702953b4eaaa5e25de8052aac02ab09ca Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 27 11:31:04 2012 +0100 Move compiled Java classes from bin/ to classes/. --- build.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.xml b/build.xml index 3f187be..b0ce368 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,6 @@ <project default="run" name="ERNIE" basedir="."> <property name="sources" value="src/"/> - <property name="classes" value="bin/"/> + <property name="classes" value="classes/"/> <property name="tests" value="test"/> <property name="docs" value="javadoc/"/> <property name="name" value="ERNIE"/>

1 0

[metrics-db/master] Include exit lists in rsync, too.
by karsten＠torproject.org 27 Jan '12

27 Jan '12

commit c7d8ec8a32ecfb24ef85745849e889f08947ddd1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 27 11:28:32 2012 +0100 Include exit lists in rsync, too. --- src/org/torproject/ernie/db/Main.java | 1 + src/org/torproject/ernie/db/RsyncDataProvider.java | 22 +++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/ernie/db/Main.java b/src/org/torproject/ernie/db/Main.java index a20748a..ab79174 100644 --- a/src/org/torproject/ernie/db/Main.java +++ b/src/org/torproject/ernie/db/Main.java @@ -146,6 +146,7 @@ public class Main { new File(config.getSanitizedBridgesWriteDirectory()), config.getSanitizedAssignmentsDirectory() == null ? null : new File(config.getSanitizedAssignmentsDirectory()), + config.getDownloadExitList(), new File(config.getRsyncDirectory())); } diff --git a/src/org/torproject/ernie/db/RsyncDataProvider.java b/src/org/torproject/ernie/db/RsyncDataProvider.java index 11aa1c0..2f2c1b4 100644 --- a/src/org/torproject/ernie/db/RsyncDataProvider.java +++ b/src/org/torproject/ernie/db/RsyncDataProvider.java @@ -13,7 +13,8 @@ import java.util.logging.*; public class RsyncDataProvider { public RsyncDataProvider(File directoryArchivesOutputDirectory, File sanitizedBridgesWriteDirectory, - File sanitizedAssignmentsDirectory, File rsyncDirectory) { + File sanitizedAssignmentsDirectory, + boolean downloadExitList, File rsyncDirectory) { /* Initialize logger. */ Logger logger = Logger.getLogger(RsyncDataProvider.class.getName()); @@ -126,6 +127,25 @@ public class RsyncDataProvider { + "are still " + fileNamesInRsync.size() + " files left in " + rsyncDirectory.getAbsolutePath() + "."); + /* Copy exit lists from the last 3 days. */ + if (downloadExitList) { + files.add(new File("exitlist")); + while (!files.isEmpty()) { + File pop = files.pop(); + if (pop.isDirectory()) { + files.addAll(Arrays.asList(pop.listFiles())); + } else if (pop.lastModified() >= cutOffMillis) { + String fileName = pop.getName(); + this.copyFile(pop, new File(rsyncDirectory, + "exit-lists/" + fileName)); + fileNamesInRsync.remove(pop.getName()); + } + } + } + logger.info("After copying exit lists, there are still " + + fileNamesInRsync.size() + " files left in " + + rsyncDirectory.getAbsolutePath() + "."); + /* Delete all files that we didn't (over-)write in this run. */ files.add(rsyncDirectory); while (!files.isEmpty()) {

1 0

[doctor/master] Warning every 6 hours about consensus params is enough.
by karsten＠torproject.org 27 Jan '12

27 Jan '12

commit 55233628d9b62bfae8a1fff64750904149c7dbcb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 27 08:09:40 2012 +0100 Warning every 6 hours about consensus params is enough. --- src/org/torproject/doctor/StatusFileReport.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/doctor/StatusFileReport.java b/src/org/torproject/doctor/StatusFileReport.java index 040a687..b103b4a 100644 --- a/src/org/torproject/doctor/StatusFileReport.java +++ b/src/org/torproject/doctor/StatusFileReport.java @@ -121,7 +121,7 @@ public class StatusFileReport { case ConflictingOrInvalidConsensusParams: warningStrings.put("NOTICE: The following directory " + "authorities set conflicting or invalid consensus " - + "parameters: " + detailsString, 150L * 60L * 1000L); + + "parameters: " + detailsString, 330L * 60L * 1000L); break; case CertificateExpiresInThreeMonths: warningStrings.put("NOTICE: The certificates of the following "

1 0