date:20130717

[tor-commits] [translation/orbot] Update translations for orbot

2013-07-17 Thread translation

commit b5389f197c745639890b776c43bf5c5e44d50300
Author: Translation commit bot translat...@torproject.org
Date:   Wed Jul 17 07:45:13 2013 +

Update translations for orbot
---
 values-id/strings.xml |6 ++
 1 file changed, 6 insertions(+)

diff --git a/values-id/strings.xml b/values-id/strings.xml
index 1107c5b..310edda 100644
--- a/values-id/strings.xml
+++ b/values-id/strings.xml
@@ -15,12 +15,18 @@
   string name=menu_homeHome/string
   string name=menu_browseJelajahi/string
   string name=menu_settingsPengaturan/string
+  string name=menu_logLog/string
   string name=menu_infoBantuan/string
   string name=menu_aboutMengenai/string
   string name=button_helpBantuan/string
   string name=button_closeDekat/string
   string name=button_aboutMengenai/string
+  string name=button_clear_logHapus Log/string
+  string name=menu_verifyPeriksa/string
   string name=menu_exitKeluar/string
+  string name=pref_transparent_all_titleTor Semuanya/string
+  string name=pref_transparent_port_titleDaftar Port/string
+  string name=pref_has_rootMinta Akses Dasar/string
   string name=btn_backKembali/string
   string name=btn_cancelBatal/string
   !--Welcome Wizard strings (DJH)--

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torcheck] Update translations for torcheck

2013-07-17 Thread translation

commit 37111867433535ba5669124724853c36789982ff
Author: Translation commit bot translat...@torproject.org
Date:   Wed Jul 17 07:46:13 2013 +

Update translations for torcheck
---
 kn/torcheck.po |   19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/kn/torcheck.po b/kn/torcheck.po
index c98aeaa..7aed970 100644
--- a/kn/torcheck.po
+++ b/kn/torcheck.po
@@ -2,13 +2,14 @@
 # Copyright (C) 2008-2012 The Tor Project, Inc
 # 
 # Translators:
+# msj2, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2012-02-16 20:28+PDT\n
-PO-Revision-Date: 2013-06-18 22:31+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-07-17 07:45+\n
+Last-Translator: msj2\n
 Language-Team: Kannada 
(http://www.transifex.com/projects/p/torproject/language/kn/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -18,13 +19,13 @@ msgstr 
 Plural-Forms: nplurals=1; plural=0;\n
 
 msgid Congratulations. Your browser is configured to use Tor.
-msgstr 
+msgstr à²¯à²¾à²¹à³, à²¨à²¿à²®à³à²® à²¬à³à²°à³à²¸à²°à³ à²à² 
à²à²¾à²°à³ à²¬à²³à²¸à³à²à³ à²¸à²¿à²¦à³à²§à²µà²¾à²¯à³à²¤à³.
 
 msgid 
 Please refer to the a href=\https://www.torproject.org/\;Tor website/a 
 for further information about using Tor safely.  You are now free to browse 
 the Internet anonymously.
-msgstr 
+msgstr à²¦à²¯à²µà²¿à²à³à²à³ à²à²¾à²°à³â à²à²¨à³à²¨à³ 
à²¸à³à²°à²à³à²·à²¿à²¤à²µà²¾à²à²¿ à²¬à²³à²¸à³à²à³  a 
href=\https://www.torproject.org/\; à²°à³à²à²¾à²°à³â 
à²¤à²¾à²£/aà²¦à²²à³à²²à²¿à²°à³ à²®à²¾à²¹à²¿à²¤à²¿ à²à²¦à²¿. 
à²¨à³à²µà³à² à²à²à²¤à²°à³à²à²¾à²²à²µà²¨à³à²¨ à²
à²¨à²¾à²®à²¿à²à²µà²¾à²à²¿ à²à²¾à²²à²¾à²¡à²¬à²¹à³à²¦à³.
 
 msgid There is a security update available for the Tor Browser Bundle.
 msgstr 
@@ -32,20 +33,20 @@ msgstr 
 msgid 
 a href=\https://www.torproject.org/download/download-easy.html\;Click 
 here to go to the download page/a
-msgstr 
+msgstr a 
href=\https://www.torproject.org/download/download-easy.html\;à²à²³à²¿à²¸à²¿à²à³à²³à³à²³à³à²à³
 à²à³à²²à²¿à²à³ à²®à²¾à²¡à²¿.a
 
 msgid Sorry. You are not using Tor.
-msgstr 
+msgstr à²à³à²·à²®à²¿à²¸à²¿, à²¨à³à²µà³ à²à²¾à²°à³ à²¬à²³à²¸à³à²¤à²¾ 
à²à²²à³à²².
 
 msgid 
 If you are attempting to use a Tor client, please refer to the a 
 href=\https://www.torproject.org/\;Tor website/a and specifically the a
  href=\https://www.torproject.org/docs/faq#DoesntWork\;instructions for 
 configuring your Tor client/a.
-msgstr 
+msgstr à²à²¾à²°à³ à²¬à²³à²¸à³à²à³ à²ªà³à²°à²¯à²¤à³à²¨ à²ªà²¡à³à²¤à²¾ 
à²à²¦à³à²¦à³à²°à²¾? a href=\https://www.torproject.org/\;à²à²¾à²°à³â 
à²¤à²¾à²£/aà²à³à²à³ à²¹à³à²à²¿ à²à²²à³à²²à²¿à²°à³a 
href=\https://www.torproject.org/docs/faq#DoesntWork\; à²®à²¾à²¹à²¿à²¤à²¿ 
/aà²¬à²³à²¸à²¿ à²à²¾à²°à³â à²à²¿à²°à²¾à²à²¿à²¯à²¨à³à²¨ 
à²¬à²³à²¸à³à²à³à²³à³à²³à²¿.
 
 msgid Sorry, your query failed or an unexpected response was received.
-msgstr 
+msgstr à²à³à²·à²®à²¿à²¸à²¿, à²¨à²¿à²®à³à²® à²ªà³à²°à²¶à³à²¨à³ 
à²«à²¼à³à²²à³ à²à²¯à³à²¤à³ à²à²¥à²µà²¾ à²à²¸à²®à²à²à²¸ 
à²ªà³à²°à²¤à²¿à²à³à²°à²¿à²¯à³ à²¸à²¿à²à³à²à²¿à²¦à³.
 
 msgid 
 A temporary service outage prevents us from determining if your source IP 
@@ -53,4 +54,4 @@ msgid 
 msgstr 
 
 msgid Your IP address appears to be: 
-msgstr 
+msgstr à²¨à²¿à²®à³à²® à². à²ªà²¿. à²µà²¿à²³à²¾à²¸ à²à²¦à³ à²à²à²¤ 
à²à²¾à²£à³à²¸à³à²¤à³à²¤à³:

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2013-07-17 Thread translation

commit 72cfa60b4d516088d5822de562b61e5eb81b1afe
Author: Translation commit bot translat...@torproject.org
Date:   Wed Jul 17 07:46:42 2013 +

Update translations for mat-gui
---
 id.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id.po b/id.po
index 30d2230..332db33 100644
--- a/id.po
+++ b/id.po
@@ -40,7 +40,7 @@ msgstr 
 
 #: mat-gui:119 mat-gui:214
 msgid Check
-msgstr 
+msgstr Periksa
 
 #: mat-gui:121
 msgid Check selected files for harmful meta

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torcheck_completed] Update translations for torcheck_completed

2013-07-17 Thread translation

commit dd56d413858870fc1d671d8ee701d261875e642c
Author: Translation commit bot translat...@torproject.org
Date:   Wed Jul 17 08:16:19 2013 +

Update translations for torcheck_completed
---
 kn/torcheck.po |   57 
 1 file changed, 57 insertions(+)

diff --git a/kn/torcheck.po b/kn/torcheck.po
new file mode 100644
index 000..041cb14
--- /dev/null
+++ b/kn/torcheck.po
@@ -0,0 +1,57 @@
+# TorCheck gettext template
+# Copyright (C) 2008-2012 The Tor Project, Inc
+# 
+# Translators:
+# msj2, 2013
+msgid 
+msgstr 
+Project-Id-Version: The Tor Project\n
+Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
+POT-Creation-Date: 2012-02-16 20:28+PDT\n
+PO-Revision-Date: 2013-07-17 07:50+\n
+Last-Translator: msj2\n
+Language-Team: Kannada 
(http://www.transifex.com/projects/p/torproject/language/kn/)\n
+MIME-Version: 1.0\n
+Content-Type: text/plain; charset=UTF-8\n
+Content-Transfer-Encoding: 8bit\n
+Generated-By: pygettext.py 1.5\n
+Language: kn\n
+Plural-Forms: nplurals=1; plural=0;\n
+
+msgid Congratulations. Your browser is configured to use Tor.
+msgstr à²¯à²¾à²¹à³, à²¨à²¿à²®à³à²® à²¬à³à²°à³à²¸à²°à³ à²à² 
à²à²¾à²°à³ à²¬à²³à²¸à³à²à³ à²¸à²¿à²¦à³à²§à²µà²¾à²¯à³à²¤à³.
+
+msgid 
+Please refer to the a href=\https://www.torproject.org/\;Tor website/a 
+for further information about using Tor safely.  You are now free to browse 
+the Internet anonymously.
+msgstr à²¦à²¯à²µà²¿à²à³à²à³ à²à²¾à²°à³â à²à²¨à³à²¨à³ 
à²¸à³à²°à²à³à²·à²¿à²¤à²µà²¾à²à²¿ à²¬à²³à²¸à³à²à³  a 
href=\https://www.torproject.org/\; à²°à³à²à²¾à²°à³â 
à²¤à²¾à²£/aà²¦à²²à³à²²à²¿à²°à³ à²®à²¾à²¹à²¿à²¤à²¿ à²à²¦à²¿. 
à²¨à³à²µà³à² à²à²à²¤à²°à³à²à²¾à²²à²µà²¨à³à²¨ à²
à²¨à²¾à²®à²¿à²à²µà²¾à²à²¿ à²à²¾à²²à²¾à²¡à²¬à²¹à³à²¦à³.
+
+msgid There is a security update available for the Tor Browser Bundle.
+msgstr à²à²¾à²°à³ à²¬à³à²°à³à²¸à²°à³âà²¨ à²¬à²à²¡à²²à³âà²à³ 
à²°à²à³à²·à²£à²¾ à²¹à³à²¸ à²à²µà³à²¤à³à²¤à²¿ 
à²°à³à²¡à²¿à²¯à²¾à²à²¿à²¦à³.
+
+msgid 
+a href=\https://www.torproject.org/download/download-easy.html\;Click 
+here to go to the download page/a
+msgstr a 
href=\https://www.torproject.org/download/download-easy.html\;à²à²³à²¿à²¸à²¿à²à³à²³à³à²³à³à²à³
 à²à³à²²à²¿à²à³ à²®à²¾à²¡à²¿.a
+
+msgid Sorry. You are not using Tor.
+msgstr à²à³à²·à²®à²¿à²¸à²¿, à²¨à³à²µà³ à²à²¾à²°à³ à²¬à²³à²¸à³à²¤à²¾ 
à²à²²à³à²².
+
+msgid 
+If you are attempting to use a Tor client, please refer to the a 
+href=\https://www.torproject.org/\;Tor website/a and specifically the a
+ href=\https://www.torproject.org/docs/faq#DoesntWork\;instructions for 
+configuring your Tor client/a.
+msgstr à²à²¾à²°à³ à²¬à²³à²¸à³à²à³ à²ªà³à²°à²¯à²¤à³à²¨ à²ªà²¡à³à²¤à²¾ 
à²à²¦à³à²¦à³à²°à²¾? a href=\https://www.torproject.org/\;à²à²¾à²°à³â 
à²¤à²¾à²£/aà²à³à²à³ à²¹à³à²à²¿ à²à²²à³à²²à²¿à²°à³a 
href=\https://www.torproject.org/docs/faq#DoesntWork\; à²®à²¾à²¹à²¿à²¤à²¿ 
/aà²¬à²³à²¸à²¿ à²à²¾à²°à³â à²à²¿à²°à²¾à²à²¿à²¯à²¨à³à²¨ 
à²¬à²³à²¸à³à²à³à²³à³à²³à²¿.
+
+msgid Sorry, your query failed or an unexpected response was received.
+msgstr à²à³à²·à²®à²¿à²¸à²¿, à²¨à²¿à²®à³à²® à²ªà³à²°à²¶à³à²¨à³ 
à²«à²¼à³à²²à³ à²à²¯à³à²¤à³ à²à²¥à²µà²¾ à²à²¸à²®à²à²à²¸ 
à²ªà³à²°à²¤à²¿à²à³à²°à²¿à²¯à³ à²¸à²¿à²à³à²à²¿à²¦à³.
+
+msgid 
+A temporary service outage prevents us from determining if your source IP 
+address is a a href=\https://www.torproject.org/\;Tor/a node.
+msgstr à²à³à²·à²®à²¿à²¸à²¿ à²¸à³à²µà²¾à²®à²¿/à²¤à²¾à²¯à²¿, à²¨à²¿à²®à³à²® 
à². à²ªà²¿. à²µà²¿à²³à²¾à²¸ a href=\https://www.torproject.org/\; 
à²à²¾à²°à³ à²¨à³à²¡à³ à²¹à³à²¦à³,/a à²à²²à³à²µà³ à²à²à²¤ 
à²²à³à²à³à² à²¹à²¾à²à³à²¦à²¿à²à³à²à³ à²¸à²¦à³à²¯à²à³à²à³ 
à²¤à³à²à²¦à³à²°à³ à²à²à³à²¤à²¿à²¦à³.
+
+msgid Your IP address appears to be: 
+msgstr à²¨à²¿à²®à³à²® à². à²ªà²¿. à²µà²¿à²³à²¾à²¸ à²à²¦à³ à²à²à²¤ 
à²à²¾à²£à³à²¸à³à²¤à³à²¤à³:

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torcheck] Update translations for torcheck

2013-07-17 Thread translation

commit 7dcb0f0a23b11bc2ee3bf12b2c939905156ecb5d
Author: Translation commit bot translat...@torproject.org
Date:   Wed Jul 17 08:16:15 2013 +

Update translations for torcheck
---
 kn/torcheck.po |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kn/torcheck.po b/kn/torcheck.po
index 7aed970..041cb14 100644
--- a/kn/torcheck.po
+++ b/kn/torcheck.po
@@ -8,7 +8,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2012-02-16 20:28+PDT\n
-PO-Revision-Date: 2013-07-17 07:45+\n
+PO-Revision-Date: 2013-07-17 07:50+\n
 Last-Translator: msj2\n
 Language-Team: Kannada 
(http://www.transifex.com/projects/p/torproject/language/kn/)\n
 MIME-Version: 1.0\n
@@ -28,7 +28,7 @@ msgid 
 msgstr à²¦à²¯à²µà²¿à²à³à²à³ à²à²¾à²°à³â à²à²¨à³à²¨à³ 
à²¸à³à²°à²à³à²·à²¿à²¤à²µà²¾à²à²¿ à²¬à²³à²¸à³à²à³  a 
href=\https://www.torproject.org/\; à²°à³à²à²¾à²°à³â 
à²¤à²¾à²£/aà²¦à²²à³à²²à²¿à²°à³ à²®à²¾à²¹à²¿à²¤à²¿ à²à²¦à²¿. 
à²¨à³à²µà³à² à²à²à²¤à²°à³à²à²¾à²²à²µà²¨à³à²¨ à²
à²¨à²¾à²®à²¿à²à²µà²¾à²à²¿ à²à²¾à²²à²¾à²¡à²¬à²¹à³à²¦à³.
 
 msgid There is a security update available for the Tor Browser Bundle.
-msgstr 
+msgstr à²à²¾à²°à³ à²¬à³à²°à³à²¸à²°à³âà²¨ à²¬à²à²¡à²²à³âà²à³ 
à²°à²à³à²·à²£à²¾ à²¹à³à²¸ à²à²µà³à²¤à³à²¤à²¿ 
à²°à³à²¡à²¿à²¯à²¾à²à²¿à²¦à³.
 
 msgid 
 a href=\https://www.torproject.org/download/download-easy.html\;Click 
@@ -51,7 +51,7 @@ msgstr à²à³à²·à²®à²¿à²¸à²¿, à²¨à²¿à²®à³à²® 
à²ªà³à²°à²¶à³à²¨à³ à²«à²¼à³
 msgid 
 A temporary service outage prevents us from determining if your source IP 
 address is a a href=\https://www.torproject.org/\;Tor/a node.
-msgstr 
+msgstr à²à³à²·à²®à²¿à²¸à²¿ à²¸à³à²µà²¾à²®à²¿/à²¤à²¾à²¯à²¿, à²¨à²¿à²®à³à²® 
à². à²ªà²¿. à²µà²¿à²³à²¾à²¸ a href=\https://www.torproject.org/\; 
à²à²¾à²°à³ à²¨à³à²¡à³ à²¹à³à²¦à³,/a à²à²²à³à²µà³ à²à²à²¤ 
à²²à³à²à³à² à²¹à²¾à²à³à²¦à²¿à²à³à²à³ à²¸à²¦à³à²¯à²à³à²à³ 
à²¤à³à²à²¦à³à²°à³ à²à²à³à²¤à²¿à²¦à³.
 
 msgid Your IP address appears to be: 
 msgstr à²¨à²¿à²®à³à²® à². à²ªà²¿. à²µà²¿à²³à²¾à²¸ à²à²¦à³ à²à²à²¤ 
à²à²¾à²£à³à²¸à³à²¤à³à²¤à³:

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-db/master] Warn if assignments.log contains duplicate fingerprints.

2013-07-17 Thread karsten

commit 4ce2bb867b3cf9fada741ee5cf7af0c95d0a091c
Author: Karsten Loesing karsten.loes...@gmx.net
Date:   Wed Jul 17 12:28:11 2013 +0200

Warn if assignments.log contains duplicate fingerprints.
---
 .../db/bridgepools/BridgePoolAssignmentsProcessor.java  |   15 +++
 1 file changed, 15 insertions(+)

diff --git 
a/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java 
b/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java
index 77cfd7a..4735d35 100644
--- 
a/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java
+++ 
b/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java
@@ -14,7 +14,9 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.SortedSet;
 import java.util.Stack;
 import java.util.TimeZone;
@@ -101,6 +103,7 @@ public class BridgePoolAssignmentsProcessor extends Thread {
 SimpleDateFormat filenameFormat =
 new SimpleDateFormat(/MM/dd/-MM-dd-HH-mm-ss);
 filenameFormat.setTimeZone(TimeZone.getTimeZone(UTC));
+String duplicateFingerprint = null;
 long maxBridgePoolAssignmentTime = 0L;
 for (File assignmentFile : assignmentFiles) {
   logger.info(Processing bridge pool assignment file '
@@ -117,6 +120,7 @@ public class BridgePoolAssignmentsProcessor extends Thread {
 String line, bridgePoolAssignmentLine = null;
 SortedSetString sanitizedAssignments = new TreeSetString();
 boolean wroteLastLine = false, skipBefore20120504125947 = true;
+SetString hashedFingerprints = null;
 while ((line = br.readLine()) != null || !wroteLastLine) {
   if (line != null  line.startsWith(bridge-pool-assignment )) {
 String[] parts = line.split( );
@@ -190,6 +194,7 @@ public class BridgePoolAssignmentsProcessor extends Thread {
   wroteLastLine = true;
 } else {
   bridgePoolAssignmentLine = line;
+  hashedFingerprints = new HashSetString();
 }
   } else {
 String[] parts = line.split( );
@@ -207,6 +212,10 @@ public class BridgePoolAssignmentsProcessor extends Thread 
{
   + line + '. Aborting.);
   break;
 }
+if (hashedFingerprints.contains(hashedFingerprint)) {
+  duplicateFingerprint = bridgePoolAssignmentLine;
+}
+hashedFingerprints.add(hashedFingerprint);
 String assignmentDetails = line.substring(40);
 sanitizedAssignments.add(hashedFingerprint
 + assignmentDetails);
@@ -220,6 +229,12 @@ public class BridgePoolAssignmentsProcessor extends Thread 
{
   }
 }
 
+if (duplicateFingerprint != null) {
+  logger.warning(At least one bridge pool assignment list contained 
+  + duplicate fingerprints.  Last found in assignment list 
+  + starting with ' + duplicateFingerprint + '.);
+}
+
 if (maxBridgePoolAssignmentTime  0L 
 maxBridgePoolAssignmentTime + 330L * 60L * 1000L
  System.currentTimeMillis()) {

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [atlas/master] Correctly display contact if undefined.

2013-07-17 Thread karsten

commit bb8721ba6ab1f208ebd8cd9e0c3457943ea17b1b
Author: Karsten Loesing karsten.loes...@gmx.net
Date:   Wed Jul 17 12:39:15 2013 +0200

Correctly display contact if undefined.

Previously, we'd display the contact of the previously shown relay.

Fixes #9281.
---
 js/models/relay.js |1 +
 1 file changed, 1 insertion(+)

diff --git a/js/models/relay.js b/js/models/relay.js
index e1e74fb..ab48b74 100644
--- a/js/models/relay.js
+++ b/js/models/relay.js
@@ -135,6 +135,7 @@ define([
 if (data.relays.length = 1) {
 var relay = data.relays[0];
 //console.log(data);
+relay.contact = relay.contact ? relay.contact : 
'undefined';
 relay.bandwidth = relay.advertised_bandwidth ? 
relay.advertised_bandwidth : null;
 relay.bandwidth_hr = relay.advertised_bandwidth ? 
hrBandwidth(relay.advertised_bandwidth) : null;
 relay.family = relay.family ? relay.family : null;

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Removing '/tor/micro/all' from the dir-spec

2013-07-17 Thread nickm

commit 804a1c36a8be630fa4568da55622755e9da12d22
Author: Damian Johnson ata...@torproject.org
Date:   Tue Jul 16 09:36:40 2013 -0700

Removing '/tor/micro/all' from the dir-spec

The dir-spec describes a dirport method for retrieving all microdescriptors.
While this is a fine idea it was never implemented. Moving the spec portion
that describes this to the attic for now.

https://trac.torproject.org/9271
---
 attic/unimplemented_dirspec.txt |   15 +++
 dir-spec.txt|8 
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/attic/unimplemented_dirspec.txt b/attic/unimplemented_dirspec.txt
new file mode 100644
index 000..f171398
--- /dev/null
+++ b/attic/unimplemented_dirspec.txt
@@ -0,0 +1,15 @@
+The following contains portions of the dir-spec that were not implemented in
+tor. They're still fine ideas, but do not belong in the specs before they...
+well, exist.
+
+Dirport Methods, Section 4.5 (https://trac.torproject.org/9271)
+
+   All the microdescriptors from the current consensus should also be
+   available at:
+ http://hostname/tor/micro/all[.z]
+   so a client that's bootstrapping doesn't need to send a 70KB URL just
+   to name every microdescriptor it's looking for.
+   [Note that /tor/micro/all[.z] is not implemented as of February 21,
+   2012. -KL]
+
+
diff --git a/dir-spec.txt b/dir-spec.txt
index 2b4a8d8..dd25bfb 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -2500,14 +2500,6 @@
instead of +s to separate items, since the + character is used in
base64 encoding.
 
-   All the microdescriptors from the current consensus should also be
-   available at:
- http://hostname/tor/micro/all[.z]
-   so a client that's bootstrapping doesn't need to send a 70KB URL just
-   to name every microdescriptor it's looking for.
-   [Note that /tor/micro/all[.z] is not implemented as of February 21,
-   2012. -KL]
-
Directory mirrors should check to make sure that the microdescriptors
they're about to serve match the right hashes (either the hashes from
the fetch URL or the hashes from the consensus, respectively).

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Noting maximum number of fingerprints/hashes that can be queried

2013-07-17 Thread nickm

commit 521858515c32e8bfa6baa31381e5dcc20dc064f1
Author: Damian Johnson ata...@torproject.org
Date:   Wed Jul 17 09:17:07 2013 -0700

Noting maximum number of fingerprints/hashes that can be queried

In our tor-dev@ discussion Karsten mentioned that we could request at most 
96
descriptors at a time when polling by their fingerprints...

https://lists.torproject.org/pipermail/tor-dev/2013-June/005005.html

This is a hardcoded limit in tor, so noting it in our spec...

https://gitweb.torproject.org/tor.git/blob/HEAD:/src/or/routerlist.c#l4435
---
 dir-spec.txt |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index dd25bfb..b6f3d84 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -2504,6 +2504,9 @@
they're about to serve match the right hashes (either the hashes from
the fetch URL or the hashes from the consensus, respectively).
 
+   (NOTE: Due to squid proxy url limitations at most 92 microdescrriptor hashes
+   can be retrieved in a single request.)
+
 4.6. Downloading and storing extra-info documents
 
All authorities, and any cache that chooses to cache extra-info documents,
@@ -2530,6 +2533,9 @@
Starting with Tor version 0.2.1.1-alpha is also available at:
   http://hostname/tor/status-vote/current/consensus/F1+F2+F3.z
 
+   (NOTE: Due to squid proxy url limitations at most 96 fingerprints can be
+   retrieved in a single request.)
+
Where F1, F2, etc. are authority identity fingerprints the client trusts.
Servers will only return a consensus if more than half of the requested
authorities have signed the document, otherwise a 404 error will be sent
@@ -2577,7 +2583,10 @@
F1,F2,F3 should be available at:
   http://hostname/tor/server/fp/F1+F2+F3.z
 
-   (NOTE: Implementations SHOULD NOT download descriptors by identity key
+   (NOTE: Due to squid proxy url limitations at most 96 fingerprints can be
+   retrieved in a single request.
+
+   Implementations SHOULD NOT download descriptors by identity key
fingerprint. This allows a corrupted server (in collusion with a cache) to
provide a unique descriptor to a client, and thereby partition that client
from the rest of the network.)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [flashproxy/master] Flush stdout after each PT line.

2013-07-17 Thread dcf

commit 17c412fb385708e31c44f8eca9a5779305f4a7f3
Author: David Fifield da...@bamsoftware.com
Date:   Wed Jul 17 10:47:15 2013 -0700

Flush stdout after each PT line.

This hadn't been causing a problem when websocket-server was run
directly by Tor, but I tried running websocket-server as a shell
subprocess, and the shell wasn't seeing its PT negotiation.
---
 websocket-transport/pt.go |1 +
 1 file changed, 1 insertion(+)

diff --git a/websocket-transport/pt.go b/websocket-transport/pt.go
index 0ff1644..1319198 100644
--- a/websocket-transport/pt.go
+++ b/websocket-transport/pt.go
@@ -89,6 +89,7 @@ func PtLine(keyword string, v ...string) {
buf.WriteString(  + escape(x))
}
fmt.Println(buf.String())
+   os.Stdout.Sync()
 }
 
 // All of the Pt*Error functions call os.Exit(1).

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/orbot] Update translations for orbot

2013-07-17 Thread translation

commit d4c4f38da2c3050de92ced7d0efaac16e57c2f68
Author: Translation commit bot translat...@torproject.org
Date:   Wed Jul 17 23:15:11 2013 +

Update translations for orbot
---
 values-is/strings.xml |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/values-is/strings.xml b/values-is/strings.xml
index 750ab06..e6f5280 100644
--- a/values-is/strings.xml
+++ b/values-is/strings.xml
@@ -6,7 +6,8 @@
   string name=secure_default_web_urlhttps://check.torproject.org/string
   string 
name=tor_check_api_urlhttps://check.torproject.org/?TorButton=true/string
   string name=control_permission_labelrÃ¦sa og stÃ¶Ã°va Tor/string
-  string name=tor_proxy_service_processtorproxyservice/string
+  string name=tor_proxy_service_processtorproxyÃ¾jÃ³nusta/string
+  string name=status_activatedTengdur viÃ° Tor netiÃ°/string
   string name=menu_homeHeim/string
   string name=menu_settingsStillingar/string
   string name=menu_infoHjÃ¡lp/string

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/vidalia_alpha] Update translations for vidalia_alpha

2013-07-17 Thread translation

commit 49bc773ff777469f2be19b11c1b31d65b4ec881a
Author: Translation commit bot translat...@torproject.org
Date:   Wed Jul 17 23:45:30 2013 +

Update translations for vidalia_alpha
---
 is/vidalia_is.po |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/is/vidalia_is.po b/is/vidalia_is.po
index e980b2b..8614089 100644
--- a/is/vidalia_is.po
+++ b/is/vidalia_is.po
@@ -6,7 +6,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2012-03-21 17:46+\n
-PO-Revision-Date: 2013-06-25 00:11+\n
+PO-Revision-Date: 2013-07-17 23:40+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: Icelandic 
(http://www.transifex.com/projects/p/torproject/language/is/)\n
 MIME-Version: 1.0\n
@@ -123,7 +123,7 @@ msgstr 
 
 msgctxt AdvancedPage
 msgid Browse
-msgstr 
+msgstr Vafra
 
 msgctxt AdvancedPage
 msgid Data Directory
@@ -1397,7 +1397,7 @@ msgstr RÃ¦sa Vidalia Ã¾egar tÃ¶lvan er rÃ¦st
 
 msgctxt GeneralPage
 msgid Browse
-msgstr 
+msgstr Vafra
 
 msgctxt GeneralPage
 msgid Tor
@@ -2341,7 +2341,7 @@ msgstr 
 
 msgctxt MessageLog
 msgid Browse
-msgstr 
+msgstr Vafra
 
 msgctxt MessageLog
 msgid Enable automatically saving all new log messages to a file
@@ -2566,7 +2566,7 @@ msgstr 
 
 msgctxt NetworkPage
 msgid Proxy Settings
-msgstr 
+msgstr Beinis Stillingar
 
 msgctxt NetworkPage
 msgid Username:
@@ -3827,7 +3827,7 @@ msgstr 
 
 msgctxt VMessageBox
 msgid Browse
-msgstr 
+msgstr Vafra
 
 msgctxt Vidalia
 msgid Invalid Argument

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbirdy] Update translations for torbirdy

2013-07-17 Thread translation

commit a6975b4fc181fb9956e8833a8a1f6722d7ceea6d
Author: Translation commit bot translat...@torproject.org
Date:   Wed Jul 17 23:46:55 2013 +

Update translations for torbirdy
---
 is/torbirdy.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/is/torbirdy.dtd b/is/torbirdy.dtd
index a245286..a85e935 100644
--- a/is/torbirdy.dtd
+++ b/is/torbirdy.dtd
@@ -14,7 +14,7 @@
 !ENTITY torbirdy.prefs.cancel.button HÃ¦tta viÃ°
 !ENTITY torbirdy.prefs.extra2.button 
 !ENTITY torbirdy.prefs.extra2.key 
-!ENTITY torbirdy.prefs.proxy.label 
+!ENTITY torbirdy.prefs.proxy.label Beinis Stillingar
 !ENTITY torbirdy.prefs.privacy.label 
 !ENTITY torbirdy.prefs.enigmail.label 
 !ENTITY torbirdy.prefs.security.label 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-07-17 Thread translation

commit c878d8cdbc75cf2a25893e6341b1fac093650794
Author: Translation commit bot translat...@torproject.org
Date:   Wed Jul 17 23:46:43 2013 +

Update translations for liveusb-creator
---
 is/is.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/is/is.po b/is/is.po
index 0cadccf..cf8fb91 100644
--- a/is/is.po
+++ b/is/is.po
@@ -9,9 +9,9 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2013-02-14 16:07+0100\n
-PO-Revision-Date: 2013-04-29 09:00+\n
+PO-Revision-Date: 2013-07-17 23:40+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
-Language-Team: LANGUAGE l...@li.org\n
+Language-Team: Icelandic 
(http://www.transifex.com/projects/p/torproject/language/is/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
@@ -75,7 +75,7 @@ msgstr 
 
 #: ../liveusb/dialog.py:153
 msgid Browse
-msgstr 
+msgstr Vafra
 
 #: ../liveusb/dialog.py:160
 msgid 
@@ -233,7 +233,7 @@ msgstr 
 
 #: ../liveusb/gui.py:663 ../liveusb/gui.py:680
 msgid Next
-msgstr 
+msgstr NÃ¦sta
 
 #: ../liveusb/gui.py:541
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2013-07-17 Thread translation

commit 1f81ab7501768c3f4f300132aa22c0273841c44e
Author: Translation commit bot translat...@torproject.org
Date:   Wed Jul 17 23:47:01 2013 +

Update translations for mat-gui
---
 is.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/is.po b/is.po
index 3f693d0..bb92e4c 100644
--- a/is.po
+++ b/is.po
@@ -40,7 +40,7 @@ msgstr 
 
 #: mat-gui:119 mat-gui:214
 msgid Check
-msgstr 
+msgstr Athuga
 
 #: mat-gui:121
 msgid Check selected files for harmful meta

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/vidalia_alpha] Update translations for vidalia_alpha

2013-07-17 Thread translation

commit 6ea0fef426f1ac00814ff1158c77d99b82510802
Author: Translation commit bot translat...@torproject.org
Date:   Thu Jul 18 00:15:32 2013 +

Update translations for vidalia_alpha
---
 is/vidalia_is.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/is/vidalia_is.po b/is/vidalia_is.po
index 8614089..ef64adb 100644
--- a/is/vidalia_is.po
+++ b/is/vidalia_is.po
@@ -6,7 +6,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2012-03-21 17:46+\n
-PO-Revision-Date: 2013-07-17 23:40+\n
+PO-Revision-Date: 2013-07-17 23:50+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: Icelandic 
(http://www.transifex.com/projects/p/torproject/language/is/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/vidalia] Update translations for vidalia

2013-07-17 Thread translation

commit e5b4dbe8abecda9b733466a4fcaf0fef6defbdb6
Author: Translation commit bot translat...@torproject.org
Date:   Thu Jul 18 00:15:23 2013 +

Update translations for vidalia
---
 is/vidalia_is.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/is/vidalia_is.po b/is/vidalia_is.po
index b4f556a..ece830b 100755
--- a/is/vidalia_is.po
+++ b/is/vidalia_is.po
@@ -6,7 +6,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2012-03-21 17:52+\n
-PO-Revision-Date: 2013-07-17 23:40+\n
+PO-Revision-Date: 2013-07-17 23:50+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: Icelandic 
(http://www.transifex.com/projects/p/torproject/language/is/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] r26258: {website} update mirror status (website/trunk/include)

2013-07-17 Thread Andrew Lewman

Author: phobos
Date: 2013-07-18 01:54:38 + (Thu, 18 Jul 2013)
New Revision: 26258

Modified:
   website/trunk/include/mirrors-table.wmi
Log:
update mirror status


Modified: website/trunk/include/mirrors-table.wmi
===
--- website/trunk/include/mirrors-table.wmi 2013-07-17 02:28:11 UTC (rev 
26257)
+++ website/trunk/include/mirrors-table.wmi 2013-07-18 01:54:38 UTC (rev 
26258)
@@ -188,6 +188,23 @@
  
 tr
 
+ tdDE/td
+
+ tdcrazyhaze.de/td
+
+ tdUp to date/td
+
+td - /td
+tda href=http://tor.crazyhaze.de/dist/;http/a/td
+tda href=http://tor.crazyhaze.de/;http/a/td
+tda href=https://tor.crazyhaze.de/dist/;https/a/td
+tda href=https://tor.crazyhaze.de/;https/a/td
+td - /td
+td - /td
+/tr
+ 
+tr
+
  tdRO/td
 
  tdme0w.cc/td
@@ -681,23 +698,6 @@
  
 tr
 
- tdINT/td
-
- tdCoralCDN/td
-
- tdUp to date/td
-
-td - /td
-tda href=http://www.torproject.org.nyud.net/dist/;http/a/td
-tda href=http://www.torproject.org.nyud.net/;http/a/td
-td - /td
-td - /td
-td - /td
-td - /td
-/tr
- 
-tr
-
  tdUS/td
 
  td/td
@@ -868,23 +868,6 @@
  
 tr
 
- tdDE/td
-
- tdcrazyhaze.de/td
-
- tdUnknown/td
-
-td - /td
-tda href=http://tor.crazyhaze.de/dist/;http/a/td
-tda href=http://tor.crazyhaze.de/;http/a/td
-tda href=https://tor.crazyhaze.de/dist/;https/a/td
-tda href=https://tor.crazyhaze.de/;https/a/td
-td - /td
-td - /td
-/tr
- 
-tr
-
  tdMX/td
 
  td/td
@@ -1021,6 +1004,23 @@
  
 tr
 
+ tdINT/td
+
+ tdCoralCDN/td
+
+ tdUnknown/td
+
+td - /td
+tda href=http://www.torproject.org.nyud.net/dist/;http/a/td
+tda href=http://www.torproject.org.nyud.net/;http/a/td
+td - /td
+td - /td
+td - /td
+td - /td
+/tr
+ 
+tr
+
  tdUS/td
 
  td/td

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] tuning of torrc to try to resolve bugs

2013-07-17 Thread n8fr8

commit 225cd328a6530458d44380890052748b6631d156
Author: n8fr8 nat...@freitas.net
Date:   Tue Feb 12 14:05:52 2013 +0700

tuning of torrc to try to resolve bugs

some users cannot connect to localhost tor control port
---
 res/raw/torrc   |   18 --
 res/raw/torrctether |   14 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/res/raw/torrc b/res/raw/torrc
index c86ad2b..fd5b506 100644
--- a/res/raw/torrc
+++ b/res/raw/torrc
@@ -1,16 +1,14 @@
 SocksPort 9050
-SafeSocks 1
+SOCKSListenAddress 127.0.0.1
+SafeSocks 0
+TestSocks 1
+WarnUnsafeSocks 1
 Log notice stdout
-ControlListenAddress 127.0.0.1
 ControlPort 9051
+ControlListenAddress 127.0.0.1
 CookieAuthentication 1
-RelayBandwidthRate 20 KBytes
-RelayBandwidthBurst 20 KBytes
-AutomapHostsOnResolve 1
-TransListenAddress 127.0.0.1
 TransPort 9040
-DNSListenAddress 127.0.0.1
+TransListenAddress 127.0.0.1
 DNSPort 5400
-HardwareAccel 1
-SafeLogging 1
-TestSocks 1
\ No newline at end of file
+DNSListenAddress 127.0.0.1
+AvoidDiskWrites 1
\ No newline at end of file
diff --git a/res/raw/torrctether b/res/raw/torrctether
index 3edb5c8..4d8fbc6 100644
--- a/res/raw/torrctether
+++ b/res/raw/torrctether
@@ -1,14 +1,18 @@
 SocksPort 9050
-SafeSocks 1
+SOCKSListenAddress 0.0.0.0
+SafeSocks 0
+TestSocks 1
+WarnUnsafeSocks 1
 Log notice stdout
-ControlListenAddress 127.0.0.1
 ControlPort 9051
+ControlListenAddress 0.0.0.0
 CookieAuthentication 1
-RelayBandwidthRate 20 KBytes
-RelayBandwidthBurst 20 KBytes
+RelayBandwidthRate 100 KBytes
+RelayBandwidthBurst 100 KBytes
 UseBridges 0
 AutomapHostsOnResolve 1
 TransListenAddress 0.0.0.0
 TransPort 9040
 DNSListenAddress 0.0.0.0
-DNSPort 5400
\ No newline at end of file
+DNSPort 5400
+AvoidDiskWrites 1
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] updated to latest libevent and tor repos

2013-07-17 Thread n8fr8

commit 2b9007e663447650931da57b592190442aa6c7a0
Author: n8fr8 nat...@freitas.net
Date:   Tue Feb 12 14:07:14 2013 +0700

updated to latest libevent and tor repos
---
 external/libevent |2 +-
 external/tor  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/external/libevent b/external/libevent
index 6f2337d..5a12d83 16
--- a/external/libevent
+++ b/external/libevent
@@ -1 +1 @@
-Subproject commit 6f2337dd0e3ec6aec54a4694f1b59e0262623d8e
+Subproject commit 5a12d8359727e8f10d08f8cd2b36c9f78747908f
diff --git a/external/tor b/external/tor
index 17c24b3..54f9a40 16
--- a/external/tor
+++ b/external/tor
@@ -1 +1 @@
-Subproject commit 17c24b3118224d6536c41fa4e1493a831fb29f0a
+Subproject commit 54f9a402c5f68633cc46c90364741fe1bd28e0da



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] updating tor binary version in constants to force upgrade

2013-07-17 Thread n8fr8

commit db49a5996dfae44411e6a6663123ac24613b79f8
Author: n8fr8 nat...@freitas.net
Date:   Fri Oct 26 09:49:19 2012 +0530

updating tor binary version in constants to force upgrade
---
 src/org/torproject/android/service/TorServiceConstants.java |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/org/torproject/android/service/TorServiceConstants.java 
b/src/org/torproject/android/service/TorServiceConstants.java
index 2fe07ae..dc6ea48 100644
--- a/src/org/torproject/android/service/TorServiceConstants.java
+++ b/src/org/torproject/android/service/TorServiceConstants.java
@@ -65,7 +65,6 @@ public interface TorServiceConstants {
 public final static String TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE = 
Bootstrapped 100%;
 
 public final static int STATUS_OFF = 0;
- //   public final static int STATUS_READY = 0;
 public final static int STATUS_ON = 1;
 public final static int STATUS_CONNECTING = 2;
 
@@ -77,7 +76,7 @@ public interface TorServiceConstants {
 public static final int DISABLE_TOR_MSG = 3;
 public static final int LOG_MSG = 4;
 
-public static final String BINARY_TOR_VERSION = 0.2.4.3-alpha;
+public static final String BINARY_TOR_VERSION = 0.2.3.23-RC;
 public static final String BINARY_PRIVOXY_VERSION = 3.0.12;
 public static final String PREF_BINARY_TOR_VERSION_INSTALLED = 
BINARY_TOR_VERSION_INTALLED;
 public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = 
BINARY_PRIVOXY_VERSION_INTALLED;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] v11 stable update

2013-07-17 Thread n8fr8

commit 2d9e6c04b6e0d19831b32925f7b43ab1191ca9f2
Author: n8fr8 nat...@freitas.net
Date:   Wed Nov 7 01:30:16 2012 +0530

v11 stable update
---
 AndroidManifest.xml |4 ++--
 CHANGELOG   |3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c527198..0fa75da 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 ?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.23-rc-1.0.11-RC5-test2 
-  android:versionCode=51
+  android:versionName=0.2.3.23-rc-1.0.11-RC6 
+  android:versionCode=52
 android:installLocation=auto
   
 uses-permission android:name=android.permission.INTERNET /
diff --git a/CHANGELOG b/CHANGELOG
index 15fa59a..d7ada10 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,8 @@
 NOTE: Specific #s below correspond to Trac tickets logged and maintained at 
https://trac.torproject.org/projects/tor/
 
 1.0.11
-- Tor updated to 0.2.4.4-alpha
+- Tor updated to 0.2.3.23-RC
+- ActionBarSherlock updated to latest release
 - libevent2 on 2.2.1-alpha
 - added data up/down speed and totals display
 - added new Log SlideDrawer log display 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] closed reader stream

2013-07-17 Thread n8fr8

commit 1576775f02efd7a37de3d57b83a2b81648d3b2f8
Author: n8fr8 nat...@freitas.net
Date:   Tue Feb 12 14:28:29 2013 +0700

closed reader stream
---
 src/org/torproject/android/Utils.java |2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/org/torproject/android/Utils.java 
b/src/org/torproject/android/Utils.java
index 1a0082f..f5f2ea5 100644
--- a/src/org/torproject/android/Utils.java
+++ b/src/org/torproject/android/Utils.java
@@ -56,6 +56,8 @@ public class Utils {
out.append('\n');

}
+   
+   reader.close();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] updated to latest jar libs

2013-07-17 Thread n8fr8

commit fe591d6f3c812cd1c1520f2736737286e2dc7569
Author: n8fr8 nat...@freitas.net
Date:   Tue Feb 12 14:07:02 2013 +0700

updated to latest jar libs
---
 libs/jtorctl.jar |  Bin 14733 - 14733 bytes
 libs/simple.jar  |  Bin 0 - 199011 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/libs/jtorctl.jar b/libs/jtorctl.jar
index 2203a09..0750695 100755
Binary files a/libs/jtorctl.jar and b/libs/jtorctl.jar differ
diff --git a/libs/simple.jar b/libs/simple.jar
new file mode 100755
index 000..440f753
Binary files /dev/null and b/libs/simple.jar differ



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] updates for reading preference settings

2013-07-17 Thread n8fr8

commit 3ea016ba20f84089a56dfb14cf6fa227c62826ad
Author: n8fr8 nat...@freitas.net
Date:   Wed Apr 3 15:46:03 2013 -0400

updates for reading preference settings
---
 src/org/torproject/android/service/TorService.java |   70 +---
 .../torproject/android/service/TorTransProxy.java  |   60 +
 2 files changed, 46 insertions(+), 84 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java 
b/src/org/torproject/android/service/TorService.java
index 4325650..3520ec1 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -135,7 +135,7 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst

initControlConnection();

-   updateTorConfiguration();
+   processSettingsImpl();

currentStatus = STATUS_ON;

@@ -233,6 +233,7 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst

initTorPaths();

+   sendCallbackLogMessage(Welcome back, Carter!);

}
 
@@ -275,7 +276,7 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
if (intent != null  intent.getAction()!=null  
intent.getAction().equals(onboot))
{

-   SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(this);
+   SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

boolean startOnBoot = 
prefs.getBoolean(pref_start_boot,false);

@@ -346,7 +347,7 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
 {
currentStatus = STATUS_OFF;

-   SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(this);
+   SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

boolean hasRoot = prefs.getBoolean(PREF_HAS_ROOT,false);

@@ -406,7 +407,7 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
private String getHiddenServiceHostname ()
{
 
-   SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(this);
+   SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

 boolean enableHiddenServices = prefs.getBoolean(pref_hs_enable, 
false);
 
@@ -445,8 +446,6 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
 
 private void killTorProcess () throws Exception
 {
-   //android.os.Debug.waitForDebugger();
-   
StringBuilder log = new StringBuilder();
int procId = -1;

@@ -535,7 +534,7 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
 
initTorPaths();

-   SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(this);
+   SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
String currTorBinary = 
prefs.getString(TorServiceConstants.PREF_BINARY_TOR_VERSION_INSTALLED, null);
String currPrivoxyBinary = 
prefs.getString(TorServiceConstants.PREF_BINARY_PRIVOXY_VERSION_INSTALLED, 
null);

@@ -628,7 +627,7 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
 
 public void initTor () throws Exception
 {
-   SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(this);
+   SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
ENABLE_DEBUG_LOG = prefs.getBoolean(pref_enable_logging,false);
Log.i(TAG,debug logging: + ENABLE_DEBUG_LOG);
 
@@ -752,7 +751,7 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst

String torrcPath = new File(appBinHome, 
TORRC_ASSET_KEY).getAbsolutePath();

-   SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(this);
+   SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
boolean transProxyTethering = 
prefs.getBoolean(pref_transparent_tethering, false);

if (transProxyTethering)
@@ -815,7 +814,7 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst

[tor-commits] [orbot/master] added new method for remote server interface for Share service

2013-07-17 Thread n8fr8

commit c4810d485db4ec32aca81fcb830ca3f136dce136
Author: n8fr8 nat...@freitas.net
Date:   Tue Feb 12 14:29:02 2013 +0700

added new method for remote server interface for Share service
---
 src/org/torproject/android/service/ITorService.aidl |5 +
 1 file changed, 5 insertions(+)

diff --git a/src/org/torproject/android/service/ITorService.aidl 
b/src/org/torproject/android/service/ITorService.aidl
index 07fa808..1d659f9 100644
--- a/src/org/torproject/android/service/ITorService.aidl
+++ b/src/org/torproject/android/service/ITorService.aidl
@@ -53,4 +53,9 @@ interface ITorService {
 */
 String getInfo (String args);
 
+/**
+* Add Onion Share
+*/
+String addOnionShare (in Uri uriData, String contentType);
+
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] UI and flow updates

2013-07-17 Thread n8fr8

commit b6e2507580b4898b1d065c31c2ca3ca8bb1fd481
Author: n8fr8 nat...@freitas.net
Date:   Wed Apr 3 15:47:55 2013 -0400

UI and flow updates
---
 src/org/torproject/android/Orbot.java  |   59 
 .../torproject/android/RandomColorCircleView.java  |8 ++-
 2 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/src/org/torproject/android/Orbot.java 
b/src/org/torproject/android/Orbot.java
index 790d555..002ddd8 100644
--- a/src/org/torproject/android/Orbot.java
+++ b/src/org/torproject/android/Orbot.java
@@ -108,12 +108,11 @@ public class Orbot extends SherlockActivity implements 
TorConstants, OnLongClick

 setLocale();
 
-   startService(new Intent(INTENT_TOR_SERVICE));
+startService(new Intent(INTENT_TOR_SERVICE));

prefs = PreferenceManager.getDefaultSharedPreferences(this);

-   
-   
+   doLayout();
}

private void doLayout ()
@@ -167,7 +166,7 @@ public class Orbot extends SherlockActivity implements 
TorConstants, OnLongClick
downloadText.setText(formatCount(0) +  /  + formatTotal(0));
uploadText.setText(formatCount(0) +  /  + formatTotal(0));

-   //updateStatus();
+   updateStatus();
 }
 
 private void appendLogTextAndScroll(String text)
@@ -330,7 +329,7 @@ public class Orbot extends SherlockActivity implements 
TorConstants, OnLongClick
protected void onPause() {
super.onPause();

-   unbindService();
+   //unbindService();

//hideProgressDialog();
 
@@ -416,11 +415,21 @@ public class Orbot extends SherlockActivity implements 
TorConstants, OnLongClick
super.onResume();

bindService();
-   
-   doLayout ();
-   
+
+   updateStatus();
}

+   
+   
+   @Override
+   protected void onNewIntent(Intent intent) {
+   
+   super.onNewIntent(intent);
+   
+   updateStatus();
+   handleIntents();
+   }
+
private void handleIntents ()
{
if (getIntent() == null)
@@ -553,7 +562,7 @@ public class Orbot extends SherlockActivity implements 
TorConstants, OnLongClick
protected void onStop() {
super.onStop();

-   unbindService();
+   //unbindService();
}
 
 
@@ -564,6 +573,7 @@ public class Orbot extends SherlockActivity implements 
TorConstants, OnLongClick
private void openBrowser(String url)
{
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+   
intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);

}
@@ -597,16 +607,15 @@ public class Orbot extends SherlockActivity implements 
TorConstants, OnLongClick
 
 @Override
 protected void onActivityResult(int requestCode, int resultCode, Intent 
data) {
-super.onActivityResult(requestCode, resultCode, data);
-
-//if we get a response from an activity we launched (like from 
line 527 where we launch the Settings/Prefs screen)
-//and the resultCode matches our arbitrary 1010 value, AND Tor is 
running
-//then update the preferences in an async background task
-if (requestCode == 1  resultCode == 1010  mService != null)
-{
-new ProcessSettingsAsyncTask().execute(mService);  
-setLocale();
-}
+super.onActivityResult(requestCode, resultCode, data);
+
+
+if (requestCode == 1  mService != null)
+{
+new ProcessSettingsAsyncTask().execute(mService);  
+setLocale();
+}
+   
 }
 
 AlertDialog aDialog = null;
@@ -922,6 +931,10 @@ public class Orbot extends SherlockActivity implements 
TorConstants, OnLongClick

downloadText.setText(formatCount(datacount.Download) +  /  + 
formatTotal(totalRead));
uploadText.setText(formatCount(datacount.Upload) +  / 
 + formatTotal(totalWrite));
 
+   if (torStatus != TorServiceConstants.STATUS_ON)
+   {
+   updateStatus();
+   }

 default:
 super.handleMessage(msg);
@@ -1021,13 +1034,15 @@ public class Orbot extends SherlockActivity implements 
TorConstants, OnLongClick
 }
 }
 
-//maybe needs this?
-mService = null; 
-
 // Detach our existing connection.

[tor-commits] [orbot/master] cleanup of imports and unclosed streams

2013-07-17 Thread n8fr8

commit 7df2acd59c6aabfdabd68bc5320a5749c98695e9
Author: n8fr8 nat...@freitas.net
Date:   Tue Feb 12 14:26:12 2013 +0700

cleanup of imports and unclosed streams
---
 src/org/torproject/android/service/TorBinaryInstaller.java |   12 ++--
 src/org/torproject/android/settings/AppManager.java|6 --
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java 
b/src/org/torproject/android/service/TorBinaryInstaller.java
index 51ff907..ffaeab3 100644
--- a/src/org/torproject/android/service/TorBinaryInstaller.java
+++ b/src/org/torproject/android/service/TorBinaryInstaller.java
@@ -13,19 +13,14 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
 
 import org.torproject.android.R;
 import org.torproject.android.TorConstants;
 
 import android.content.Context;
 import android.util.Log;
-import android.widget.Toast;
 
 public class TorBinaryInstaller implements TorServiceConstants {
 
@@ -125,10 +120,11 @@ public class TorBinaryInstaller implements 
TorServiceConstants {
 
 
OutputStream stmOut = new FileOutputStream(outFile, append);
+   ZipInputStream zis = null;

if (zip)
{
-   ZipInputStream zis = new ZipInputStream(stm);   
+   zis = new ZipInputStream(stm);  
ZipEntry ze = zis.getNextEntry();
stm = zis;

@@ -144,6 +140,10 @@ public class TorBinaryInstaller implements 
TorServiceConstants {
 stmOut.close();
 stm.close();
 
+if (zis != null)
+   zis.close();
+
+
 return true;
 
 }
diff --git a/src/org/torproject/android/settings/AppManager.java 
b/src/org/torproject/android/settings/AppManager.java
index 46b33f1..ae03924 100644
--- a/src/org/torproject/android/settings/AppManager.java
+++ b/src/org/torproject/android/settings/AppManager.java
@@ -6,15 +6,12 @@ package org.torproject.android.settings;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
 
 import org.torproject.android.R;
 import org.torproject.android.TorConstants;
-import org.torproject.android.R.id;
-import org.torproject.android.R.layout;
 
 import android.app.Activity;
 import android.content.Context;
@@ -23,9 +20,6 @@ import android.content.SharedPreferences.Editor;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.PermissionInfo;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.view.LayoutInflater;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] cleaned up notification support and added Share service

2013-07-17 Thread n8fr8

commit c5627f4f9a5a252bd2731c3514dedaa8c973b86c
Author: n8fr8 nat...@freitas.net
Date:   Tue Feb 12 14:29:41 2013 +0700

cleaned up notification support and added Share service
---
 src/org/torproject/android/service/TorService.java |  284 ++--
 1 file changed, 200 insertions(+), 84 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java 
b/src/org/torproject/android/service/TorService.java
index dd4e3fb..4325650 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -30,6 +30,8 @@ import org.torproject.android.R;
 import org.torproject.android.TorConstants;
 import org.torproject.android.Utils;
 import org.torproject.android.settings.AppManager;
+import org.torproject.android.share.ShareItem;
+import org.torproject.android.share.ShareService;
 
 import android.app.Application;
 import android.app.Notification;
@@ -43,12 +45,14 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.net.ConnectivityManager;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.IBinder;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
 import android.preference.PreferenceManager;
 import android.util.Log;
+import android.widget.Toast;
 
 public class TorService extends Service implements TorServiceConstants, 
TorConstants, Runnable, EventHandler
 {
@@ -74,7 +78,12 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
 private ArrayListString configBuffer = null;
 private ArrayListString resetBuffer = null;
  
-   
+//Orbot file sharing service
+
+   private ShareService mShareServe = null; //if hidden services activated
+   private String mShareServeHost = null;
+   private int mShareServePort = -1;
+   
//   private String appHome;
 private File appBinHome;
 private File appCacheHome;
@@ -87,6 +96,9 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
 
private long mTotalTrafficWritten = 0;
private long mTotalTrafficRead = 0;
+   private boolean mConnectivity = true; 
+   
+   private NotificationManager mNotificationManager = null;

 public void logMessage(String msg)
 {
@@ -123,6 +135,8 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst

initControlConnection();

+   updateTorConfiguration();
+   
currentStatus = STATUS_ON;

return true;
@@ -178,18 +192,16 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst

private void clearNotifications ()
{
-   NotificationManager mNotificationManager = 
(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
mNotificationManager.cancelAll();


}

+   
private void showToolbarNotification (String notifyMsg, int notifyId, 
int icon, int flags)
{


-   NotificationManager mNotificationManager = 
(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-

CharSequence tickerText = notifyMsg;
long when = System.currentTimeMillis();
@@ -208,7 +220,6 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
 
notification.setLatestEventInfo(context, contentTitle, 
contentText, contentIntent);
 
-
mNotificationManager.notify(notifyId, notification);
 
 
@@ -235,7 +246,13 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
_torInstance = this;

initTorPaths();
+
+  IntentFilter mNetworkStateFilter = new 
IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
+  registerReceiver(mNetworkStateReceiver , mNetworkStateFilter);

+
+   mNotificationManager = (NotificationManager) 
getSystemService(Context.NOTIFICATION_SERVICE);
+
new Thread ()
{

@@ -282,8 +299,6 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
 {
   initTor();
   isRunning = true;
-  IntentFilter mNetworkStateFilter = new 
IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
-  registerReceiver(mNetworkStateReceiver , 
mNetworkStateFilter);
 }
 catch (Exception e)

[tor-commits] [orbot/master] proper spelling of Farsi

2013-07-17 Thread n8fr8

commit e2bbe4cae6b4ee911ac3d74ccdf0f49af8435ade
Author: n8fr8 nat...@freitas.net
Date:   Wed Nov 7 01:31:54 2012 +0530

proper spelling of Farsi
---
 res/values/arrays.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 85074e6..fb0a7c3 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -6,7 +6,7 @@
itemDefault/item
itemEnglish/item
itemØ§ÙØ¹Ø±Ø¨ÙØ©/item
-   itemÙ¾Ø§Ø±Ø³Û/item
+   itemÙØ§Ø±Ø³Û/item
itemä¸æ(ç®ä½)/item
itemDeutsche/item
itemEspaÃ±ol/item
@@ -41,4 +41,4 @@

/string-array
 
-/resources
\ No newline at end of file
+/resources



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] added missing path to libevent include

2013-07-17 Thread n8fr8

commit 1748cb49e268e1ff2f0d716af3f6e8689f21628d
Author: n8fr8 nat...@freitas.net
Date:   Tue Feb 12 13:44:09 2013 +0700

added missing path to libevent include
---
 external/Makefile |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index 4d3dd1d..300a465 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -109,10 +109,10 @@ libevent: openssl-static libevent-build-stamp
test -d lib || mkdir lib
test -d include || mkdir include
cp libevent/.libs/libevent.a lib
-   cp -R libevent/include/* include
+   cp -R libevent/include/event2 include
 
 libevent-clean:
-   -rm -f include/*.h
+   -rm -f include/event2
-rm -f lib/libevent.a
-rm -f libevent-build-stamp
-cd libevent  \
@@ -153,7 +153,7 @@ tor/Makefile: tor/configure
cp config.guess tor
cd tor  \
 CC=$(CC) AR=$(AR) RANLIB=$(RANLIB) CFLAGS=$(CFLAGS) 
-D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow 
LDFLAGS=$(LDFLAGS) \
-LIBS=-L$(EXTERNAL_ROOT)/lib 
CFLAGS=-I$(EXTERNAL_ROOT)/include \
+LIBS=-L$(EXTERNAL_ROOT)/lib 
CFLAGS=-I$(EXTERNAL_ROOT)/include -I$(EXTERNAL_ROOT)/include/event2 \
 ./configure \
 --host=$(HOST) \
 --prefix=$(NDK_TOOLCHAIN) \
@@ -280,7 +280,6 @@ assets: tor privoxy jtorctl obfsproxy
zip ../../res/raw/tor.mp3 tor
 
 assets-clean:
-   -rm ../res/raw/tor
-rm ../res/raw/tor.mp3
-rm ../res/raw/privoxy
-rm ../libs/*



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] updated for settings return value

2013-07-17 Thread n8fr8

commit 667fa647c7a7c64fed37bc5ef200ee0db44e1857
Author: n8fr8 nat...@freitas.net
Date:   Wed Apr 3 15:46:50 2013 -0400

updated for settings return value
---
 src/org/torproject/android/settings/SettingsPreferences.java |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/org/torproject/android/settings/SettingsPreferences.java 
b/src/org/torproject/android/settings/SettingsPreferences.java
index 82085d9..f0fbafd 100644
--- a/src/org/torproject/android/settings/SettingsPreferences.java
+++ b/src/org/torproject/android/settings/SettingsPreferences.java
@@ -120,12 +120,11 @@ public class SettingsPreferences
protected void onStop() {
super.onStop();

-   //Log.d(getClass().getName(),Exiting Preferences);
}
 
public boolean onPreferenceClick(Preference preference) {

-   setResult(1010);
+   setResult(RESULT_OK);

if (preference == prefRequestRoot)
{



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] updated to android 17 target

2013-07-17 Thread n8fr8

commit 63b31cdb9793ea7b8da7e51206020593a5a5c364
Author: n8fr8 nat...@freitas.net
Date:   Tue Feb 12 14:27:56 2013 +0700

updated to android 17 target
---
 project.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.properties b/project.properties
index 2566d16..6bf01f1 100644
--- a/project.properties
+++ b/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-16
+target=android-17
 android.library.reference.1=../ActionBarSherlock/library



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] updated built binary to 0.2.4.10-alpha

2013-07-17 Thread n8fr8

commit aaa2ed56de4b9f4652aa9bb973571414e472d15c
Author: n8fr8 nat...@freitas.net
Date:   Tue Feb 12 14:05:39 2013 +0700

updated built binary to 0.2.4.10-alpha
---
 res/raw/tor.mp3 |  Bin 2074073 - 2177439 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3
index ac91763..b687cf1 100644
Binary files a/res/raw/tor.mp3 and b/res/raw/tor.mp3 differ



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] updated tor binary version number

2013-07-17 Thread n8fr8

commit 25a895a608acfb0251df601a16bdc606691287e3
Author: n8fr8 nat...@freitas.net
Date:   Tue Feb 12 14:29:30 2013 +0700

updated tor binary version number
---
 src/org/torproject/android/service/TorServiceConstants.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/torproject/android/service/TorServiceConstants.java 
b/src/org/torproject/android/service/TorServiceConstants.java
index dc6ea48..0dca5d2 100644
--- a/src/org/torproject/android/service/TorServiceConstants.java
+++ b/src/org/torproject/android/service/TorServiceConstants.java
@@ -76,7 +76,7 @@ public interface TorServiceConstants {
 public static final int DISABLE_TOR_MSG = 3;
 public static final int LOG_MSG = 4;
 
-public static final String BINARY_TOR_VERSION = 0.2.3.23-RC;
+public static final String BINARY_TOR_VERSION = 0.2.4.10-alpha;
 public static final String BINARY_PRIVOXY_VERSION = 3.0.12;
 public static final String PREF_BINARY_TOR_VERSION_INSTALLED = 
BINARY_TOR_VERSION_INTALLED;
 public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = 
BINARY_PRIVOXY_VERSION_INTALLED;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] support landscape layout and new Share intent

2013-07-17 Thread n8fr8

commit 21c27972d99102da73c5c619cd41a252d751740e
Author: n8fr8 nat...@freitas.net
Date:   Tue Feb 12 14:26:38 2013 +0700

support landscape layout and new Share intent

- when device is landscape, the log will show on the main screen
- Orbot v12 includes a new simple share service for HS based file sharing
---
 src/org/torproject/android/Orbot.java |  133 ++---
 1 file changed, 104 insertions(+), 29 deletions(-)

diff --git a/src/org/torproject/android/Orbot.java 
b/src/org/torproject/android/Orbot.java
index 6f96350..790d555 100644
--- a/src/org/torproject/android/Orbot.java
+++ b/src/org/torproject/android/Orbot.java
@@ -4,12 +4,15 @@
 package org.torproject.android;
 
 import java.util.Locale;
+import java.util.StringTokenizer;
 
 import org.torproject.android.service.ITorService;
 import org.torproject.android.service.ITorServiceCallback;
 import org.torproject.android.service.TorServiceConstants;
 import org.torproject.android.settings.ProcessSettingsAsyncTask;
 import org.torproject.android.settings.SettingsPreferences;
+import org.torproject.android.share.ShareItem;
+import org.torproject.android.share.ShareService;
 import org.torproject.android.wizard.ChooseLocaleWizardActivity;
 
 import android.annotation.SuppressLint;
@@ -71,7 +74,7 @@ public class Orbot extends SherlockActivity implements 
TorConstants, OnLongClick
/* Tor Service interaction */
/* The primary interface we will be calling on the service. */
 ITorService mService = null;
-   private boolean autoStartOnBind = false;
+   private boolean autoStartFromIntent = false;
 
SharedPreferences prefs;

@@ -109,6 +112,12 @@ public class Orbot extends SherlockActivity implements 
TorConstants, OnLongClick

prefs = PreferenceManager.getDefaultSharedPreferences(this);

+   
+   
+   }
+   
+   private void doLayout ()
+   {
setContentView(R.layout.layout_main);

lblStatus = (TextView)findViewById(R.id.lblStatus);
@@ -122,20 +131,23 @@ public class Orbot extends SherlockActivity implements 
TorConstants, OnLongClick
 
 mDrawer = ((SlidingDrawer)findViewById(R.id.SlidingDrawer));
Button slideButton = (Button)findViewById(R.id.slideButton);
-   slideButton.setOnTouchListener(new OnTouchListener (){
-
-   @Override
-   public boolean onTouch(View v, MotionEvent event) {
-
-   if (event.equals(MotionEvent.ACTION_DOWN))
-   {
-   mDrawerOpen = !mDrawerOpen;
-   mTxtOrbotLog.setEnabled(mDrawerOpen);   

+   if (slideButton != null)
+   {
+   slideButton.setOnTouchListener(new OnTouchListener (){
+   
+   @Override
+   public boolean onTouch(View v, MotionEvent 
event) {
+   
+   if 
(event.equals(MotionEvent.ACTION_DOWN))
+   {
+   mDrawerOpen = !mDrawerOpen;
+   
mTxtOrbotLog.setEnabled(mDrawerOpen);   
+   }
+   return false;
}
-   return false;
-   }
-   
-   });
+   
+   });
+   }

ScrollingMovementMethod smm = new ScrollingMovementMethod();

@@ -155,6 +167,7 @@ public class Orbot extends SherlockActivity implements 
TorConstants, OnLongClick
downloadText.setText(formatCount(0) +  /  + formatTotal(0));
uploadText.setText(formatCount(0) +  /  + formatTotal(0));

+   //updateStatus();
 }
 
 private void appendLogTextAndScroll(String text)
@@ -297,7 +310,7 @@ public class Orbot extends SherlockActivity implements 
TorConstants, OnLongClick
 stopService(new Intent(ITorService.class.getName()));
 
 //clears all notifications from the status bar
-NotificationManager mNotificationManager = 
(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+NotificationManager mNotificationManager = 
(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 mNotificationManager.cancelAll();
 
 
@@ -373,6 +386,23 @@ public class Orbot extends SherlockActivity implements 
TorConstants, OnLongClick

String onionHostname = prefs.getString(pref_hs_hostname,);
 
+   while

[tor-commits] [orbot/master] updated params for tuning, including largeHeap=true

2013-07-17 Thread n8fr8

commit eb3f95c31a4d7d11f238b3950851ea642f713694
Author: n8fr8 nat...@freitas.net
Date:   Tue Feb 12 14:27:31 2013 +0700

updated params for tuning, including largeHeap=true
---
 AndroidManifest.xml |   20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2df28d5..dbccba0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 ?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.25-1.0.12-alpha-1 
-  android:versionCode=53
+  android:versionName=v12 alpha 2 (Tor 0.2.4.10-alpha) 
+  android:versionCode=54
 android:installLocation=auto
   
 uses-permission android:name=android.permission.INTERNET /
@@ -15,6 +15,10 @@
  android:label=@string/app_name 
  android:configChanges=locale|orientation|screenSize
   android:theme=@style/Theme.Sherlock
+  android:largeHeap=true
+  android:persistent=true
+  android:allowBackup=false
+  android:allowClearUserData=true
  
   
 activity android:name=.Orbot 
android:configChanges=orientation|screenSize
@@ -44,6 +48,17 @@
 category android:name=android.intent.category.DEFAULT /
action android:name=org.torproject.android.START_TOR /
 /intent-filter
+
+  intent-filter
+ action android:name=android.intent.action.SEND /
+
+ category android:name=android.intent.category.DEFAULT /
+ category android:name=android.intent.category.ALTERNATIVE 
/ 
+ category 
android:name=android.intent.category.SELECTED_ALTERNATIVE / 
+ 
+ data android:mimeType=*/* /
+ /intent-filter 
+   
 /activity

activity android:name=.wizard.LotsaText/
@@ -58,6 +73,7 @@
service android:enabled=true
android:name=.service.TorService 
android:exported=false
+android:process=:orbot 

intent-filter
action 
android:name=org.torproject.android.service.ITorService /



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] updates for new UI and file sharing

2013-07-17 Thread n8fr8

commit 86d8c165873c70b77071bef6f567cddaf7f2a842
Author: n8fr8 nat...@freitas.net
Date:   Wed Jul 17 22:16:25 2013 -0400

updates for new UI and file sharing
---
 .gitignore  |1 +
 AndroidManifest.xml |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6688785..543565d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ bin
 gen
 native
 local.properties
+builds
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cfa029e..af26646 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=v12 alpha 3 (Tor 0.2.4.10-alpha) 
+  android:versionName=v12-alpha3-tor-0.2.4.10-alpha 
   android:versionCode=55
 android:installLocation=auto
   



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] updated locale handling to stop flashing

2013-07-17 Thread n8fr8

commit 8023d16ce8ca9ca53858cc860c80437720b1cf76
Author: n8fr8 nat...@freitas.net
Date:   Thu Feb 7 15:24:01 2013 +0700

updated locale handling to stop flashing
---
 AndroidManifest.xml  |9 +
 src/org/torproject/android/OrbotApp.java |   15 +++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0fa75da..2df28d5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,22 +1,23 @@
 ?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.23-rc-1.0.11-RC6 
-  android:versionCode=52
+  android:versionName=0.2.3.25-1.0.12-alpha-1 
+  android:versionCode=53
 android:installLocation=auto
   
 uses-permission android:name=android.permission.INTERNET /
uses-permission 
android:name=android.permission.RECEIVE_BOOT_COMPLETED/
 uses-permission android:name=android.permission.ACCESS_NETWORK_STATE /

-uses-sdk android:minSdkVersion=5 android:targetSdkVersion=15/
+uses-sdk android:minSdkVersion=5 android:targetSdkVersion=17/
+
 application android:name=.OrbotApp android:icon=@drawable/ic_launcher
  android:label=@string/app_name 
  android:configChanges=locale|orientation|screenSize
   android:theme=@style/Theme.Sherlock
  
   
-activity android:name=.Orbot 
android:configChanges=locale|orientation|screenSize
+activity android:name=.Orbot 
android:configChanges=orientation|screenSize
 intent-filter
 action android:name=android.intent.action.MAIN /
 category android:name=android.intent.category.LAUNCHER /
diff --git a/src/org/torproject/android/OrbotApp.java 
b/src/org/torproject/android/OrbotApp.java
index 66a1e9a..d470afb 100644
--- a/src/org/torproject/android/OrbotApp.java
+++ b/src/org/torproject/android/OrbotApp.java
@@ -35,10 +35,14 @@ public class OrbotApp extends Application implements 
TorConstants
locale = new Locale(lang);

 Locale.setDefault(locale);
-config.locale = locale;
-getResources().updateConfiguration(config, 
getResources().getDisplayMetrics());
+
+Configuration myConfig = new Configuration(config);
+   myConfig.locale = locale;
+   
+getResources().updateConfiguration(myConfig, 
getResources().getDisplayMetrics());
 }
 
+
 }

 @Override
@@ -51,9 +55,12 @@ public class OrbotApp extends Application implements 
TorConstants
 if (! .equals(lang)  ! newConfig.locale.getLanguage().equals(lang))
 {
 locale = new Locale(lang);
-newConfig.locale = locale;
 Locale.setDefault(locale);
-getResources().updateConfiguration(newConfig, 
getResources().getDisplayMetrics());
+
+Configuration myConfig = new Configuration(newConfig);
+   myConfig.locale = locale;
+
+getResources().updateConfiguration(myConfig, 
getResources().getDisplayMetrics());
 }
 }
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] updated jtorctrl built library

2013-07-17 Thread n8fr8

commit 74fed91fd222c9eb92705e0415a24f8f7e0be7cb
Author: n8fr8 nat...@freitas.net
Date:   Wed Jul 17 22:38:49 2013 -0400

updated jtorctrl built library
---
 libs/jtorctl.jar |  Bin 14733 - 14733 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/libs/jtorctl.jar b/libs/jtorctl.jar
index 0750695..6aa755a 100755
Binary files a/libs/jtorctl.jar and b/libs/jtorctl.jar differ



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] share service via http hidden service

2013-07-17 Thread n8fr8

commit 442216fd2e6881874b93f9cd0901215ff19c1a62
Author: n8fr8 nat...@freitas.net
Date:   Wed Apr 3 15:47:40 2013 -0400

share service via http hidden service
---
 src/org/torproject/android/share/ShareService.java |   45 +---
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/org/torproject/android/share/ShareService.java 
b/src/org/torproject/android/share/ShareService.java
index c34fe43..7f25c22 100644
--- a/src/org/torproject/android/share/ShareService.java
+++ b/src/org/torproject/android/share/ShareService.java
@@ -1,6 +1,7 @@
 package org.torproject.android.share;
 
 import java.io.BufferedOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -24,10 +25,14 @@ import android.database.Cursor;
 import android.provider.MediaStore;
 import android.util.Log;
 
-public class ShareService implements Container {
+public class ShareService implements Container, Runnable {
 
private final static String TAG = OrbotShare;

+   private final static String LOCALHOST = 127.0.0.1;
+   private int mPort = -1;
+   private Thread thread = null;
+   
public static class Task implements Runnable {
   
   private final Response response;
@@ -41,12 +46,17 @@ public class ShareService implements Container {
   public void run() {
  try {

+//  android.os.Debug.waitForDebugger();
+
Path path = request.getPath();
String rPath = path.toString();
if (rPath.length()  0)
rPath = rPath.substring(1);

-   ShareItem sItem = sShareItems.get(rPath);
+   ShareItem sItem = null;
+   
+   if (sShareItems != null)
+   sItem = sShareItems.get(rPath);

if (sItem != null)
{
@@ -106,6 +116,13 @@ public class ShareService implements Container {

  } catch(Exception e) {
 Log.e(TAG,error handling request,e);
+try {
+   response.setCode(500);
+   response.close();
+   } catch (IOException e1) {
+   // TODO Auto-generated catch block
+   e1.printStackTrace();
+   }
  }
   }
} 
@@ -124,11 +141,25 @@ public class ShareService implements Container {

public void startService (int port) throws Exception {
   
-  mServer = new ContainerServer(this);
-  mConnection = new SocketConnection(mServer);
-  SocketAddress address = new InetSocketAddress(port);
-
-  mConnection.connect(address);
+ mPort = port;
+ thread = new Thread(this);
+ thread.start();
+   }
+   
+   public void run ()
+   {
+  try
+  {
+ mServer = new ContainerServer(this);
+ mConnection = new SocketConnection(mServer);
+ SocketAddress address = new InetSocketAddress(0.0.0.0, mPort);
+   
+ mConnection.connect(address);
+  }
+  catch (Exception e)
+  {
+  Log.e(TAG,error starting share service!,e);
+  }
}

public void stopService () throws Exception {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] updated Tor repo

2013-07-17 Thread n8fr8

commit 4f9a5028266729f5af65b423a56fdbddcca6aac3
Author: n8fr8 nat...@freitas.net
Date:   Wed Jul 17 22:37:25 2013 -0400

updated Tor repo
---
 external/tor |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/tor b/external/tor
index 54f9a40..e7b4358 16
--- a/external/tor
+++ b/external/tor
@@ -1 +1 @@
-Subproject commit 54f9a402c5f68633cc46c90364741fe1bd28e0da
+Subproject commit e7b435872cce464fee8efa75cdb228f07a367c2b



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] updating version

2013-07-17 Thread n8fr8

commit 1bf7bb0d5e8fb8778979d6f6b1baae7e2e35456c
Author: n8fr8 nat...@freitas.net
Date:   Wed Jul 17 22:41:38 2013 -0400

updating version
---
 AndroidManifest.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index af26646..da87f00 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 ?xml version=1.0 encoding=utf-8?
 manifest xmlns:android=http://schemas.android.com/apk/res/android;
   package=org.torproject.android 
-  android:versionName=v12-alpha3-tor-0.2.4.10-alpha 
-  android:versionCode=55
+  android:versionName=v12-beta-tor-0.2.4.15-rc 
+  android:versionCode=56
 android:installLocation=auto
   
 uses-permission android:name=android.permission.INTERNET /

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] updated process to singletop; rev'd version

2013-07-17 Thread n8fr8

commit 8aaa8cbfb8e710162946f3e496cbe5a03509aa53
Author: n8fr8 nat...@freitas.net
Date:   Wed Apr 3 15:49:07 2013 -0400

updated process to singletop; rev'd version
---
 AndroidManifest.xml |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dbccba0..cfa029e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 ?xml version=1.0 encoding=utf-8?
 manifest xmlns:android=http://schemas.android.com/apk/res/android;
   package=org.torproject.android 
-  android:versionName=v12 alpha 2 (Tor 0.2.4.10-alpha) 
-  android:versionCode=54
+  android:versionName=v12 alpha 3 (Tor 0.2.4.10-alpha) 
+  android:versionCode=55
 android:installLocation=auto
   
 uses-permission android:name=android.permission.INTERNET /
@@ -19,9 +19,12 @@
   android:persistent=true
   android:allowBackup=false
   android:allowClearUserData=true
+  android:hardwareAccelerated=true
  
   
-activity android:name=.Orbot 
android:configChanges=orientation|screenSize
+activity android:name=.Orbot 
android:configChanges=orientation|screenSize
+android:launchMode=singleTop 
+
 intent-filter
 action android:name=android.intent.action.MAIN /
 category android:name=android.intent.category.LAUNCHER /



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] add simple external module to ignore path

2013-07-17 Thread n8fr8

commit 700121d4c162e9751ceffa56e690c3c49469bdf1
Author: n8fr8 nat...@freitas.net
Date:   Wed Apr 3 15:48:44 2013 -0400

add simple external module to ignore path
---
 .gitignore |1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 3a7c5c0..6688785 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ external/test.c
 external/test.h.gch
 external/tor-build-stamp
 external/translation/
+external/simple*
 bin
 gen
 native



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] new preference value updates

2013-07-17 Thread n8fr8

commit 2ab32fcccd415ce666593983c76494db58c66e72
Author: n8fr8 nat...@freitas.net
Date:   Wed Apr 3 15:48:16 2013 -0400

new preference value updates
---
 res/values/strings.xml  |   23 ++-
 res/xml/preferences.xml |   11 +++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d49d8b3..9e07996 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -129,18 +129,31 @@
   string name=pref_entrance_nodeEntrance Nodes/string
   string name=pref_entrance_node_summaryFingerprints, nicks, countries and 
addresses for the first hop/string
   string name=pref_entrance_node_dialogEnter Entrance Nodes/string
-  !--string name=pref_use_whispercoreUse WhisperCore/string
-string name=pref_use_whispercore_summaryUse the proprietary NetFilter APIs 
provided by WhisperSystems (required device with WhisperCore 
installed)/string--
-  string name=pref_proxy_titleOutbound Network Proxy/string
+  
+  string name=pref_proxy_titleOutbound Network Proxy (Optional)/string
+  
   string name=pref_proxy_type_titleOutbound Proxy Type/string
   string name=pref_proxy_type_summaryProtocol to use for proxy server: 
HTTP, HTTPS, Socks4, Socks5/string
   string name=pref_proxy_type_dialogEnter Proxy Type/string
+  
   string name=pref_proxy_host_titleOutbound Proxy Host/string
-  string name=pref_proxy_host_summaryProxy server hostname/string
+  string name=pref_proxy_host_summaryProxy Server hostname/string
   string name=pref_proxy_host_dialogEnter Proxy Host/string
+  
   string name=pref_proxy_port_titleOutbound Proxy Port/string
-  string name=pref_proxy_port_summaryProxy server port/string
+  string name=pref_proxy_port_summaryProxy Server port/string
   string name=pref_proxy_port_dialogEnter Proxy port/string
+
+  string name=pref_proxy_username_titleOutbound Proxy Username/string
+  string name=pref_proxy_username_summaryProxy Username (Optional)/string
+  string name=pref_proxy_username_dialogEnter Proxy Username/string
+  
+  string name=pref_proxy_password_titleOutbound Proxy Password/string
+  string name=pref_proxy_password_summaryProxy Password (Optional)/string
+  string name=pref_proxy_password_dialogEnter Proxy Password/string
+  
+  
+  
   string name=statusStatus/string
   string name=setting_up_full_transparent_proxying_Setting up full 
transparent proxying#8230;/string
   string name=setting_up_app_based_transparent_proxying_Setting up 
app-based transparent proxying#8230;/string
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 96fe78f..2f92046 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -187,6 +187,17 @@ android:title=@string/pref_proxy_port_title
 android:summary=@string/pref_proxy_port_summary
 android:dialogTitle=@string/pref_proxy_port_dialog
 /
+
+EditTextPreference android:key=pref_proxy_username
+android:title=@string/pref_proxy_username_title
+android:summary=@string/pref_proxy_username_summary
+android:dialogTitle=@string/pref_proxy_username_dialog
+/
+EditTextPreference android:key=pref_proxy_password
+android:title=@string/pref_proxy_password_title
+android:summary=@string/pref_proxy_password_summary
+android:dialogTitle=@string/pref_proxy_password_dialog
+/
 /PreferenceCategory
 
 PreferenceCategory android:title=Debug



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [flashproxy/master] Move max message size to a constant.

2013-07-17 Thread dcf

commit 176f87c99305ca3be5c5601d535a8bbe3f2cc35d
Author: David Fifield da...@bamsoftware.com
Date:   Wed Jul 17 20:11:15 2013 -0700

Move max message size to a constant.
---
 websocket-transport/websocket-server.go |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/websocket-transport/websocket-server.go 
b/websocket-transport/websocket-server.go
index 11e2daf..f5fed31 100644
--- a/websocket-transport/websocket-server.go
+++ b/websocket-transport/websocket-server.go
@@ -21,6 +21,8 @@ import (
 
 const ptMethodName = websocket
 const requestTimeout = 10 * time.Second
+// 16 kilobytes, possibly base64-encoded.
+const maxMessageSize = 16*1024*4/3 + 1
 
 var logFile = os.Stderr
 
@@ -186,8 +188,7 @@ func startListener(addr *net.TCPAddr) (*net.TCPListener, 
error) {
go func() {
var config WebsocketConfig
config.Subprotocols = []string{base64}
-   // 16 kilobytes, possibly base64-encoded.
-   config.MaxMessageSize = 16*1024*4/3 + 1
+   config.MaxMessageSize = maxMessageSize
s := http.Server{
Handler: config.Handler(websocketHandler),
ReadTimeout: requestTimeout,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [flashproxy/master] Increase maximum message size to 64 KB.

2013-07-17 Thread dcf

commit a0991bc1ba646bf74ab07532df36ad5271e8c86f
Author: David Fifield da...@bamsoftware.com
Date:   Wed Jul 17 20:15:13 2013 -0700

Increase maximum message size to 64 KB.

Testing obfs3-in-websocket was reliably failing at 50% bootstrapped with
a message of about 30 KB.
---
 websocket-transport/websocket-server.go |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/websocket-transport/websocket-server.go 
b/websocket-transport/websocket-server.go
index f5fed31..655cf7b 100644
--- a/websocket-transport/websocket-server.go
+++ b/websocket-transport/websocket-server.go
@@ -22,7 +22,7 @@ import (
 const ptMethodName = websocket
 const requestTimeout = 10 * time.Second
 // 16 kilobytes, possibly base64-encoded.
-const maxMessageSize = 16*1024*4/3 + 1
+const maxMessageSize = 64*1024*4/3 + 1
 
 var logFile = os.Stderr
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

48 matches

Mail list logo