[tor-commits] [metrics-web/master] Make connbidirect graph more readable.

2013-12-22 Thread karsten 
commit d708c6ff61ab01ec9b6f4b585bc610b41a3f31ee
Author: Karsten Loesing karsten.loes...@gmx.net
Date:   Sun Dec 22 09:02:53 2013 +0100

Make connbidirect graph more readable.

Based on suggestions by Rob Jansen.
---
 rserve/graphs.R |   46 +++---
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/rserve/graphs.R b/rserve/graphs.R
index 014ffc0..ea25a1d 100644
--- a/rserve/graphs.R
+++ b/rserve/graphs.R
@@ -674,28 +674,44 @@ plot_connbidirect - function(start, end, path) {
   end - min(end, as.character(Sys.Date() - 2))
   c - read.csv(/srv/metrics.torproject.org/web/stats/connbidirect.csv,
 stringsAsFactors = FALSE)
-  c - c[c$date = start  c$date = end, ]
+  c - c[c$date = start  c$date = end 
+ c$read + c$write + c$both  0, ]
   c - data.frame(date = as.Date(c$date, %Y-%m-%d),
-  readnum = c$read, writenum = c$write, bothnum = c$both)
-  connbidirect - data.frame(date = c$date, c[, 2:4] /
-  (c$readnum + c$writenum + c$bothnum))
-  connbidirect - melt(connbidirect, id = date)
+  both = c$both / (c$read + c$write + c$both),
+  read = c$read / (c$read + c$write + c$both),
+  write = c$write / (c$read + c$write + c$both))
+  c - aggregate(list(both = c$both, read = c$read, write = c$write),
+ by = list(date = c$date), quantile,
+ probs = c(0.25, 0.5, 0.75))
+  c - rbind(
+data.frame(date = as.Date(c$date), data.frame(c$both),
+   variable = both),
+data.frame(date = as.Date(c$date), data.frame(c$write),
+   variable = write),
+data.frame(date = as.Date(c$date), data.frame(c$read),
+   variable = read))
   date_breaks - date_breaks(
-as.numeric(max(as.Date(connbidirect$date, %Y-%m-%d)) -
-min(as.Date(connbidirect$date, %Y-%m-%d
-  ggplot(connbidirect, aes(x = as.Date(date, %Y-%m-%d), y = value,
-  colour = variable)) +
-geom_point(size = 2.5) +
+as.numeric(max(as.Date(c$date, %Y-%m-%d)) -
+min(as.Date(c$date, %Y-%m-%d
+  ggplot(c, aes(x = date, y = X50., colour = variable)) +
+geom_line(size = 0.75) +
+geom_ribbon(aes(x = date, ymin = X25., ymax = X75., fill = variable),
+alpha = 0.5, legend = FALSE) +
 scale_x_date(name = paste(\nThe Tor Project - ,
 https://metrics.torproject.org/;, sep = ),
 format = date_breaks$format, major = date_breaks$major,
 minor = date_breaks$minor) +
 scale_y_continuous(name = , formatter = percent) +
-scale_colour_hue(, breaks = c(readnum, writenum, bothnum),
-labels = c(Mostly reading, Mostly writing,
-Both reading and writing)) +
-opts(title = Fraction of connections used uni-/bidirectionally,
-legend.position = top)
+scale_colour_hue(name = Medians and interquartile ranges,
+ breaks = c(both, write, read),
+labels = c(Both reading and writing, Mostly writing,
+   Mostly reading)) +
+scale_fill_hue(name = Medians and interquartile ranges,
+   breaks = c(both, write, read),
+labels = c(Both reading and writing, Mostly writing,
+   Mostly reading)) +
+opts(title = Fraction of connections used uni-/bidirectionally\n,
+  legend.position = top)
   ggsave(filename = path, width = 8, height = 5, dpi = 72)
 }
 

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

[tor-commits] [torbutton/master] Bug #9486: Clear NoScript Temporary Permissions on New Identity

2013-12-22 Thread mikeperry 
commit dd488acd13f8b753e8ed471d33439e121e007d94
Author: Mike Perry mikeperry-...@torproject.org
Date:   Sun Dec 22 02:15:59 2013 -0600

Bug #9486: Clear NoScript Temporary Permissions on New Identity
---
 src/chrome/content/torbutton.js |9 +
 1 file changed, 9 insertions(+)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 6298e46..4d37d46 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -1457,6 +1457,15 @@ function torbutton_do_new_identity() {
   torbutton_log(3, New Identity: Emitting Private Browsing Session clear 
event);
   obsSvc.notifyObservers(null, browser:purge-session-history, );
 
+  torbutton_log(3, New Identity: Clearing NoScript Temporary Permissions);
+
+  try {
+if(m_tb_prefs.prefHasUserValue(noscript.temp))
+  m_tb_prefs.clearUserPref(noscript.temp);
+  } catch(e) {
+torbutton_log(4, New Identity: Error clearing NoScript Temporary 
Permissions: +e);
+  }
+
   torbutton_log(3, New Identity: Clearing HTTP Auth);
 
   if(m_tb_prefs.getBoolPref('extensions.torbutton.clear_http_auth')) {

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

[tor-commits] r26504: {website} Add two more websites using Onionoo data (website/trunk/projects/en)

2013-12-22 Thread Karsten Loesing 
Author: kloesing
Date: 2013-12-22 08:27:05 + (Sun, 22 Dec 2013)
New Revision: 26504

Modified:
   website/trunk/projects/en/onionoo.wml
Log:
Add two more websites using Onionoo data

Modified: website/trunk/projects/en/onionoo.wml
===
--- website/trunk/projects/en/onionoo.wml   2013-12-21 03:12:36 UTC (rev 
26503)
+++ website/trunk/projects/en/onionoo.wml   2013-12-22 08:27:05 UTC (rev 
26504)
@@ -35,6 +35,12 @@
 that allows you to search for Tor relays and bridges. It gives you a
 detailed overview of properties and configurations of a relay or
 bridge./li
+liThe a href=https://nos-oignons.net/Services/index.en.html;Nos
+oignons/a website uses Onionoo to visualize bandwidth histories of
+their relays./li
+liThe a href=https://metrics.torproject.org/bubbles.html;metrics
+website/a visualizes diversity of the Tor network using bubble
+graphs./li
 /ul
 
 The following Onionoo clients are currently unmaintained, but are

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

[tor-commits] [tor-browser-bundle/master] Bug 10447: Remove SocksListenAddress to allow multiple socks ports.

2013-12-22 Thread mikeperry 
commit 09cf78382131f567ee3c0a85178b67af8d35398f
Author: Mike Perry mikeperry-...@torproject.org
Date:   Sun Dec 22 02:27:53 2013 -0600

Bug 10447: Remove SocksListenAddress to allow multiple socks ports.

The man page says SocksListenAddress is deprecated as of 0.2.3.x-alpha.
---
 Bundle-Data/linux/Data/Tor/torrc-defaults   |1 -
 Bundle-Data/mac/Data/Tor/torrc-defaults |1 -
 Bundle-Data/windows/Data/Tor/torrc-defaults |1 -
 3 files changed, 3 deletions(-)

diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults 
b/Bundle-Data/linux/Data/Tor/torrc-defaults
index 0c46e9f..819b9e8 100644
--- a/Bundle-Data/linux/Data/Tor/torrc-defaults
+++ b/Bundle-Data/linux/Data/Tor/torrc-defaults
@@ -5,7 +5,6 @@ AvoidDiskWrites 1
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
-SocksListenAddress 127.0.0.1
 SocksPort 9150
 ControlPort 9151
 CookieAuthentication 1
diff --git a/Bundle-Data/mac/Data/Tor/torrc-defaults 
b/Bundle-Data/mac/Data/Tor/torrc-defaults
index 0c46e9f..819b9e8 100644
--- a/Bundle-Data/mac/Data/Tor/torrc-defaults
+++ b/Bundle-Data/mac/Data/Tor/torrc-defaults
@@ -5,7 +5,6 @@ AvoidDiskWrites 1
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
-SocksListenAddress 127.0.0.1
 SocksPort 9150
 ControlPort 9151
 CookieAuthentication 1
diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults 
b/Bundle-Data/windows/Data/Tor/torrc-defaults
index 0c46e9f..819b9e8 100644
--- a/Bundle-Data/windows/Data/Tor/torrc-defaults
+++ b/Bundle-Data/windows/Data/Tor/torrc-defaults
@@ -5,7 +5,6 @@ AvoidDiskWrites 1
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
-SocksListenAddress 127.0.0.1
 SocksPort 9150
 ControlPort 9151
 CookieAuthentication 1

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

[tor-commits] [tor-browser-bundle/master] Bug 10464: Remove addons.mozilla.org from script whitelist.

2013-12-22 Thread mikeperry 
commit fa24046cd17362cb76f3dbf638b54505b93154f8
Author: Mike Perry mikeperry-...@torproject.org
Date:   Sun Dec 22 02:23:48 2013 -0600

Bug 10464: Remove addons.mozilla.org from script whitelist.

Issue 1 was that it was it was HTTP. Issue 2 was that Fully disable 
scripts
should really mean that, and damn the consequences.
---
 .../Browser/profile.default/preferences/extension-overrides.js |4 ++--
 .../Browser/profile.default/preferences/extension-overrides.js |4 ++--
 .../Browser/profile.default/preferences/extension-overrides.js |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
 
b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
index 206f868..8ba6211 100644
--- 
a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
+++ 
b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -17,14 +17,14 @@ pref(extensions.https_everywhere.toolbar_hint_shown, 
true);
 
 # NoScript Preferences:
 pref(capability.policy.maonoscript.javascript.enabled, allAccess);
-pref(capability.policy.maonoscript.sites, addons.mozilla.org about: 
about:addons about:blank about:blocked about:certerror about:config 
about:crashes about:credits about:home about:neterror about:plugins 
about:privatebrowsing about:sessionrestore chrome: resource:);
+pref(capability.policy.maonoscript.sites, about: chrome: resource:);
 pref(noscript.ABE.enabled, false);
 pref(noscript.ABE.notify, false);
 pref(noscript.ABE.wanIpAsLocal, false);
 pref(noscript.autoReload, false);
 pref(noscript.confirmUnblock, false);
 pref(noscript.contentBlocker, true);
-pref(noscript.default, about:blank about:credits addons.mozilla.org 
flashgot.net google.com gstatic.com googlesyndication.com informaction.com 
yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com 
passport.net passportimages.com live.com);
+pref(noscript.default, about: chrome: resources:);
 pref(noscript.firstRunRedirection, false);
 pref(noscript.global, true);
 pref(noscript.gtemp, );
diff --git 
a/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js
 
b/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js
index 206f868..8ba6211 100644
--- 
a/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js
+++ 
b/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -17,14 +17,14 @@ pref(extensions.https_everywhere.toolbar_hint_shown, 
true);
 
 # NoScript Preferences:
 pref(capability.policy.maonoscript.javascript.enabled, allAccess);
-pref(capability.policy.maonoscript.sites, addons.mozilla.org about: 
about:addons about:blank about:blocked about:certerror about:config 
about:crashes about:credits about:home about:neterror about:plugins 
about:privatebrowsing about:sessionrestore chrome: resource:);
+pref(capability.policy.maonoscript.sites, about: chrome: resource:);
 pref(noscript.ABE.enabled, false);
 pref(noscript.ABE.notify, false);
 pref(noscript.ABE.wanIpAsLocal, false);
 pref(noscript.autoReload, false);
 pref(noscript.confirmUnblock, false);
 pref(noscript.contentBlocker, true);
-pref(noscript.default, about:blank about:credits addons.mozilla.org 
flashgot.net google.com gstatic.com googlesyndication.com informaction.com 
yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com 
passport.net passportimages.com live.com);
+pref(noscript.default, about: chrome: resources:);
 pref(noscript.firstRunRedirection, false);
 pref(noscript.global, true);
 pref(noscript.gtemp, );
diff --git 
a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
 
b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
index 206f868..4edb7de 100644
--- 
a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
+++ 
b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -17,14 +17,14 @@ pref(extensions.https_everywhere.toolbar_hint_shown, 
true);
 
 # NoScript Preferences:
 pref(capability.policy.maonoscript.javascript.enabled, allAccess);
-pref(capability.policy.maonoscript.sites, addons.mozilla.org about: 
about:addons about:blank about:blocked about:certerror about:config 
about:crashes about:credits about:home about:neterror about:plugins 
about:privatebrowsing about:sessionrestore chrome: resource:);
+pref(capability.policy.maonoscript.sites, about: chrome: resource:);
 pref(noscript.ABE.enabled, false);
 pref(noscript.ABE.notify, false);
 pref(noscript.ABE.wanIpAsLocal, false);
 pref(noscript.autoReload, false);
 pref(noscript.confirmUnblock, false);
 pref(noscript.contentBlocker, true);
-pref(noscript.default, about:blank about:credits addons.mozilla.org 
flashgot.net google.com gstatic.com googlesyndication.com

[tor-commits] [tor/release-0.2.4] write the release blurb for 0.2.4.20, and give it a date

2013-12-22 Thread arma 
commit 8eb617dca35146ad9bd732e083c2961eacaad84e
Author: Roger Dingledine a...@torproject.org
Date:   Sun Dec 22 04:11:03 2013 -0500

write the release blurb for 0.2.4.20, and give it a date
---
 ChangeLog|   12 +++-
 ReleaseNotes |   34 ++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index eb4a0be..066bb9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
-Changes in version 0.2.4.20 - 201?-??-??
+Changes in version 0.2.4.20 - 2013-12-22
+  Tor 0.2.4.20 fixes potentially poor random number generation for users
+  who 1) use OpenSSL 1.0.0 or later, 2) set HardwareAccel 1 in their
+  torrc file, 3) have Sandy Bridge or Ivy Bridge Intel processors,
+  and 4) have no state file in their DataDirectory (as would happen on
+  first start). Users who generated relay or hidden service identity
+  keys in such a situation should discard them and generate new ones.
+
+  This release also fixes a logic error that caused Tor clients to build
+  many more preemptive circuits than they actually need.
+
   o Major bugfixes:
 - Do not allow OpenSSL engines to replace the PRNG, even when
   HardwareAccel is set. The only default builtin PRNG engine uses
diff --git a/ReleaseNotes b/ReleaseNotes
index c23a7de..ad9121b 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -3,6 +3,40 @@ This document summarizes new features and bugfixes in each 
stable release
 of Tor. If you want to see more detailed descriptions of the changes in
 each development snapshot, see the ChangeLog file.
 
+Changes in version 0.2.4.20 - 2013-12-22
+  Tor 0.2.4.20 fixes potentially poor random number generation for users
+  who 1) use OpenSSL 1.0.0 or later, 2) set HardwareAccel 1 in their
+  torrc file, 3) have Sandy Bridge or Ivy Bridge Intel processors,
+  and 4) have no state file in their DataDirectory (as would happen on
+  first start). Users who generated relay or hidden service identity
+  keys in such a situation should discard them and generate new ones.
+
+  This release also fixes a logic error that caused Tor clients to build
+  many more preemptive circuits than they actually need.
+
+  o Major bugfixes:
+- Do not allow OpenSSL engines to replace the PRNG, even when
+  HardwareAccel is set. The only default builtin PRNG engine uses
+  the Intel RDRAND instruction to replace the entire PRNG, and
+  ignores all attempts to seed it with more entropy. That's
+  cryptographically stupid: the right response to a new alleged
+  entropy source is never to discard all previously used entropy
+  sources. Fixes bug 10402; works around behavior introduced in
+  OpenSSL 1.0.0. Diagnosis and investigation thanks to coderman
+  and rl1987.
+- Avoid launching spurious extra circuits when a stream is pending.
+  This fixes a bug where any circuit that _wasn't_ unusable for new
+  streams would be treated as if it were, causing extra circuits to
+  be launched. Fixes bug 10456; bugfix on 0.2.4.12-alpha.
+
+  o Minor bugfixes:
+- Avoid a crash bug when starting with a corrupted microdescriptor
+  cache file. Fixes bug 10406; bugfix on 0.2.2.6-alpha.
+- If we fail to dump a previously cached microdescriptor to disk, avoid
+  freeing duplicate data later on. Fixes bug 10423; bugfix on
+  0.2.4.13-alpha. Spotted by bobnomnom.
+
+
 Changes in version 0.2.4.19 - 2013-12-11
   The Tor 0.2.4 release series is dedicated to the memory of Aaron Swartz
   (1986-2013). Aaron worked on diverse projects including helping to guide

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

[tor-commits] [tor/release-0.2.4] bump to 0.2.4.20

2013-12-22 Thread arma 
commit 9f7be021f3a7a284aa9c68ee453abaf82a1a0cfe
Author: Roger Dingledine a...@torproject.org
Date:   Sun Dec 22 04:21:42 2013 -0500

bump to 0.2.4.20
---
 configure.ac |2 +-
 contrib/tor-mingw.nsi.in |2 +-
 src/win32/orconfig.h |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 398aa82..63d1e13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl Copyright (c) 2007-2013, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
-AC_INIT([tor],[0.2.4.19])
+AC_INIT([tor],[0.2.4.20])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 7314b51..c1f0db8 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include LogicLib.nsh
 !include FileFunc.nsh
 !insertmacro GetParameters
-!define VERSION 0.2.4.19
+!define VERSION 0.2.4.20
 !define INSTALLER tor-${VERSION}-win32.exe
 !define WEBSITE https://www.torproject.org/;
 !define LICENSE LICENSE
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 746e216..9d108f5 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION 0.2.4.19
+#define VERSION 0.2.4.20
 
 
 

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

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

2013-12-22 Thread translation 
commit 5af5584054b1e12a69729355a031b2d1806c4748
Author: Translation commit bot translat...@torproject.org
Date:   Sun Dec 22 09:45:57 2013 +

Update translations for https_everywhere_completed
---
 hu/https-everywhere.dtd |4 
 1 file changed, 4 insertions(+)

diff --git a/hu/https-everywhere.dtd b/hu/https-everywhere.dtd
index b57c76e..3423a6a 100644
--- a/hu/https-everywhere.dtd
+++ b/hu/https-everywhere.dtd
@@ -40,3 +40,7 @@
 !ENTITY https-everywhere.popup.paragraph3 Örülünk, ha a tovább 
használja a fejlesztői verziót, és így a HTTPS Everywhere-t jobbá 
tehetjük! Biztosan talál erre vagy arra néhány hibát, amit bejelenthet a 
https-everywh...@eff.org címre. Elnézést a következetlenségért, és 
köszönjük hogy a HTTPS Everywhere-t használja.
 !ENTITY https-everywhere.popup.keep Maradok a fejlesztői verziónál
 !ENTITY https-everywhere.popup.revert Letöltöm az utolsó stabil verziót
+
+!ENTITY https-everywhere.ruleset-tests.status_title HTTPS Everywhere 
szabálygyűjtemény tesztek
+!ENTITY https-everywhere.ruleset-tests.status_cancel_button Mégse
+!ENTITY https-everywhere.ruleset-tests.status_start_button Indítás

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

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

2013-12-22 Thread translation 
commit 8e53d73324e9499b99adb7c0c721b5fb24b3fb76
Author: Translation commit bot translat...@torproject.org
Date:   Sun Dec 22 09:45:52 2013 +

Update translations for https_everywhere
---
 hu/https-everywhere.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hu/https-everywhere.dtd b/hu/https-everywhere.dtd
index 069b442..3423a6a 100644
--- a/hu/https-everywhere.dtd
+++ b/hu/https-everywhere.dtd
@@ -41,6 +41,6 @@
 !ENTITY https-everywhere.popup.keep Maradok a fejlesztői verziónál
 !ENTITY https-everywhere.popup.revert Letöltöm az utolsó stabil verziót
 
-!ENTITY https-everywhere.ruleset-tests.status_title HTTPS Everywhere Ruleset 
Tests
+!ENTITY https-everywhere.ruleset-tests.status_title HTTPS Everywhere 
szabálygyűjtemény tesztek
 !ENTITY https-everywhere.ruleset-tests.status_cancel_button Mégse
 !ENTITY https-everywhere.ruleset-tests.status_start_button Indítás

___
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-12-22 Thread translation 
commit 9bab9f08500bf2cc3e721bdad9e8ffa20a9f8566
Author: Translation commit bot translat...@torproject.org
Date:   Sun Dec 22 11:15:57 2013 +

Update translations for liveusb-creator
---
 hu/hu.po |  135 +++---
 1 file changed, 68 insertions(+), 67 deletions(-)

diff --git a/hu/hu.po b/hu/hu.po
index 1a7476b..8f36eb5 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# kane zsogelenc...@gmail.com, 2013
 # Sulyok Péter p...@fedoraproject.org, 2009
 # vargaviktor viktor.va...@gmail.com, 2013
 # vargaviktor viktor.va...@gmail.com, 2012
@@ -10,9 +11,9 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2013-11-12 13:29+0100\n
-PO-Revision-Date: 2013-11-13 09:23+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+POT-Creation-Date: 2013-12-21 11:30+0100\n
+PO-Revision-Date: 2013-12-22 11:00+\n
+Last-Translator: kane zsogelenc...@gmail.com\n
 Language-Team: Hungarian 
(http://www.transifex.com/projects/p/torproject/language/hu/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -25,22 +26,22 @@ msgstr 
 msgid %(distribution)s installer
 msgstr 
 
-#: ../liveusb/gui.py:807
+#: ../liveusb/gui.py:808
 #, python-format
 msgid %(filename)s selected
 msgstr %(filename)s kiválasztva
 
-#: ../liveusb/gui.py:437
+#: ../liveusb/gui.py:439
 #, python-format
 msgid %(size)s %(label)s
 msgstr 
 
-#: ../liveusb/gui.py:443
+#: ../liveusb/gui.py:445
 #, python-format
 msgid %(vendor)s %(model)s (%(details)s) - %(device)s
 msgstr 
 
-#: ../liveusb/creator.py:1023
+#: ../liveusb/creator.py:1020
 #, python-format
 msgid %s already bootable
 msgstr %s már bootolható
@@ -97,16 +98,16 @@ msgid 
 persist after a reboot.
 msgstr 
 
-#: ../liveusb/creator.py:1125 ../liveusb/creator.py:1388
+#: ../liveusb/creator.py:1122 ../liveusb/creator.py:1385
 #, python-format
 msgid Calculating the SHA1 of %s
 msgstr %s SHA1 számítása 
 
-#: ../liveusb/creator.py:1336
+#: ../liveusb/creator.py:1333
 msgid Cannot find
 msgstr Nem található
 
-#: ../liveusb/creator.py:545
+#: ../liveusb/creator.py:542
 #, python-format
 msgid Cannot find device %s
 msgstr A(z) %s eszköz nem található
@@ -130,7 +131,7 @@ msgstr Klónozás\n\nFrissítés
 msgid Creating %sMB persistent overlay
 msgstr 
 
-#: ../liveusb/gui.py:565
+#: ../liveusb/gui.py:567
 msgid 
 Device is not yet mounted, so we cannot determine the amount of free space.
 msgstr Az eszköz még nem csatolt, így nem meghatározható a szabad hely 
mennyisége.
@@ -140,11 +141,11 @@ msgstr Az eszköz még nem csatolt, így nem 
meghatározható a szabad hely men
 msgid Download %(distribution)s
 msgstr %(distribution)s letöltése
 
-#: ../liveusb/gui.py:781
+#: ../liveusb/gui.py:782
 msgid Download complete!
 msgstr Letöltés kész!
 
-#: ../liveusb/gui.py:785
+#: ../liveusb/gui.py:786
 msgid Download failed: 
 msgstr A letöltés nem sikerült:
 
@@ -153,16 +154,16 @@ msgstr A letöltés nem sikerült:
 msgid Downloading %s...
 msgstr %s letöltése…
 
-#: ../liveusb/creator.py:1121
+#: ../liveusb/creator.py:1118
 msgid Drive is a loopback, skipping MBR reset
 msgstr Az egység egy hurok, az MBR alaphelyzetbe állítás átugrása
 
-#: ../liveusb/creator.py:816
+#: ../liveusb/creator.py:813
 #, python-format
 msgid Entering unmount_device for '%(device)s'
 msgstr A '%(device)s' eszközre unmount_device végrehajtása
 
-#: ../liveusb/creator.py:1201
+#: ../liveusb/creator.py:1198
 msgid Error probing device
 msgstr Hiba az eszköz próbájakor
 
@@ -182,7 +183,7 @@ msgstr Hiba: Az élő CD kép SHA1 összegének 
ellenőrzése sikertelen.  A pr
 msgid Extracting live image to the target device...
 msgstr 
 
-#: ../liveusb/creator.py:1066
+#: ../liveusb/creator.py:1063
 #, python-format
 msgid Formatting %(device)s as FAT32
 msgstr A %(device)s formázása FAT32-re
@@ -205,7 +206,7 @@ msgstr 
 msgid Install Tails
 msgstr 
 
-#: ../liveusb/gui.py:628
+#: ../liveusb/gui.py:630
 msgid Installation complete!
 msgstr Telepítés kész!
 
@@ -214,11 +215,11 @@ msgstr Telepítés kész!
 msgid Installation complete! (%s)
 msgstr Telepítés kész! (%s)
 
-#: ../liveusb/gui.py:629
+#: ../liveusb/gui.py:631
 msgid Installation was completed. Press OK to close this program.
 msgstr A telepítés befejeződött. Kattintson az OK gombra a program 
bezárásához.
 
-#: ../liveusb/creator.py:919 ../liveusb/creator.py:1242
+#: ../liveusb/creator.py:916 ../liveusb/creator.py:1239
 msgid Installing bootloader...
 msgstr Bootloader telepítése...
 
@@ -226,28 +227,28 @@ msgstr Bootloader telepítése...
 msgid LiveUSB creation failed!
 msgstr Az élő USB létrehozása nem sikerült!
 
-#: ../liveusb/creator.py:1337
+#: ../liveusb/creator.py:1334
 msgid 
 Make sure to extract the entire liveusb-creator zip file before running this
  program.
 msgstr

[tor-commits] r26505: {website} change the text of the download-easy donation widget. (website/trunk/download/en)

2013-12-22 Thread Andrew Lewman 
Author: phobos
Date: 2013-12-22 18:03:22 + (Sun, 22 Dec 2013)
New Revision: 26505

Modified:
   website/trunk/download/en/download-easy.wml
Log:
change the text of the download-easy donation widget.


Modified: website/trunk/download/en/download-easy.wml
===
--- website/trunk/download/en/download-easy.wml 2013-12-22 08:27:05 UTC (rev 
26504)
+++ website/trunk/download/en/download-easy.wml 2013-12-22 18:03:22 UTC (rev 
26505)
@@ -249,7 +249,7 @@
   });
   /script
 form class=dbox dl action=https://www.paypal.com/cgi-bin/webscr; 
method=post
-h2Help create more Tor!/h2
+h2Defend your privacy online!/h2
   p
select name=currency_code class=cur
  option value=USD selected=selected$/option

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

[tor-commits] r26506: {website} make the d-e donations text shorter (website/trunk/download/en)

2013-12-22 Thread Andrew Lewman 
Author: phobos
Date: 2013-12-22 18:09:45 + (Sun, 22 Dec 2013)
New Revision: 26506

Modified:
   website/trunk/download/en/download-easy.wml
Log:
make the d-e donations text shorter


Modified: website/trunk/download/en/download-easy.wml
===
--- website/trunk/download/en/download-easy.wml 2013-12-22 18:03:22 UTC (rev 
26505)
+++ website/trunk/download/en/download-easy.wml 2013-12-22 18:09:45 UTC (rev 
26506)
@@ -249,7 +249,7 @@
   });
   /script
 form class=dbox dl action=https://www.paypal.com/cgi-bin/webscr; 
method=post
-h2Defend your privacy online!/h2
+h2Support more privacy!/h2
   p
select name=currency_code class=cur
  option value=USD selected=selected$/option

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

[tor-commits] r26508: {website} change to $10 per ticket 10435 (website/trunk/download/en)

2013-12-22 Thread Andrew Lewman 
Author: phobos
Date: 2013-12-22 18:15:02 + (Sun, 22 Dec 2013)
New Revision: 26508

Modified:
   website/trunk/download/en/download-easy.wml
Log:
change to $10 per ticket 10435


Modified: website/trunk/download/en/download-easy.wml
===
--- website/trunk/download/en/download-easy.wml 2013-12-22 18:14:44 UTC (rev 
26507)
+++ website/trunk/download/en/download-easy.wml 2013-12-22 18:15:02 UTC (rev 
26508)
@@ -257,7 +257,7 @@
  option value=GBPpound;/option
  option value=YENyen;/option
/select
-   input type=text id=amount class=amount name=amount value=5 
size=10
+   input type=text id=amount class=amount name=amount value=10 
size=10
   /p
   p
input type=hidden id=a3 name=a3 value=0

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

[tor-commits] r26507: {website} change to $10 per ticket 10435 (website/trunk/donate/en)

2013-12-22 Thread Andrew Lewman 
Author: phobos
Date: 2013-12-22 18:14:44 + (Sun, 22 Dec 2013)
New Revision: 26507

Modified:
   website/trunk/donate/en/donate.wml
Log:
change to $10 per ticket 10435


Modified: website/trunk/donate/en/donate.wml
===
--- website/trunk/donate/en/donate.wml  2013-12-22 18:09:45 UTC (rev 26506)
+++ website/trunk/donate/en/donate.wml  2013-12-22 18:14:44 UTC (rev 26507)
@@ -248,7 +248,7 @@
 li id=price class=control-group
   label class=control-label style=width: 40pxAmount:/label
   div class=controls style=margin-left: 60px
-input name=price type=number class=noscroll 
value=5.00 placeholder=Amount maxlength=10 min=0.01 step=0.01 
style=width: 39%  /
+input name=price type=number class=noscroll 
value=10.00 placeholder=Amount maxlength=10 min=0.01 step=0.01 
style=width: 39%  /
 select name=currency value= style=width: 49% 
   option value=USD selected=selectedUSD/option
   option value=BTCBTC/option

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

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

2013-12-22 Thread translation 
commit 210596e736d424c0aa29b67eeaf0d74503504027
Author: Translation commit bot translat...@torproject.org
Date:   Sun Dec 22 19:15:51 2013 +

Update translations for https_everywhere
---
 pt_BR/ssl-observatory.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd
index 54362fa..dac0edf 100644
--- a/pt_BR/ssl-observatory.dtd
+++ b/pt_BR/ssl-observatory.dtd
@@ -85,7 +85,7 @@ Passe o mouse sobre as opções para ver mais detalhes:
 !ENTITY ssl-observatory.warning.showcert Mostrar a série do certificado
 !ENTITY ssl-observatory.warning.okay Eu entendo
 !ENTITY ssl-observatory.warning.text O Observatório SSL de EFF emitiu um 
aviso sobre o(s) certificados(s) HTTPS para este site:
-!ENTITY ssl-observatory.warning.defense Se você estiver entrado neste site, 
é aconselhável trocar sua senha assim que você tiver uma conexão segura.
+!ENTITY ssl-observatory.warning.defense Se você estiver entrado neste site, 
é aconselhável trocar a sua senha assim que você tiver uma conexão segura.
 
 !ENTITY ssl-observatory.prefs.self_signed
 Envie e verifique os certificados auto-assinados

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

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

2013-12-22 Thread translation 
commit c77d7a2052a81fc3b696b0fa6b990112cc6fc205
Author: Translation commit bot translat...@torproject.org
Date:   Sun Dec 22 19:15:56 2013 +

Update translations for https_everywhere_completed
---
 pt_BR/ssl-observatory.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd
index 54362fa..dac0edf 100644
--- a/pt_BR/ssl-observatory.dtd
+++ b/pt_BR/ssl-observatory.dtd
@@ -85,7 +85,7 @@ Passe o mouse sobre as opções para ver mais detalhes:
 !ENTITY ssl-observatory.warning.showcert Mostrar a série do certificado
 !ENTITY ssl-observatory.warning.okay Eu entendo
 !ENTITY ssl-observatory.warning.text O Observatório SSL de EFF emitiu um 
aviso sobre o(s) certificados(s) HTTPS para este site:
-!ENTITY ssl-observatory.warning.defense Se você estiver entrado neste site, 
é aconselhável trocar sua senha assim que você tiver uma conexão segura.
+!ENTITY ssl-observatory.warning.defense Se você estiver entrado neste site, 
é aconselhável trocar a sua senha assim que você tiver uma conexão segura.
 
 !ENTITY ssl-observatory.prefs.self_signed
 Envie e verifique os certificados auto-assinados

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

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

2013-12-22 Thread translation 
commit 12aed28824789bd5dae2ec57c2d7e31748d3016d
Author: Translation commit bot translat...@torproject.org
Date:   Sun Dec 22 19:45:53 2013 +

Update translations for https_everywhere
---
 pt_BR/ssl-observatory.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd
index dac0edf..b104069 100644
--- a/pt_BR/ssl-observatory.dtd
+++ b/pt_BR/ssl-observatory.dtd
@@ -46,9 +46,9 @@ to turn it on?--
 !ENTITY ssl-observatory.prefs.done Pronto
 
 !ENTITY ssl-observatory.prefs.explanation 
-O HTTPS Em todo lugar pode usar o EFF's SSL Observatório, para realizar duas 
funções: (1) enviar cópias dos certificados HTTPS ao Observatório, para 
ajudar-nos
+O HTTPS Everywhere pode usar o Observatório SSL de EFFs para realizar duas 
funções: (1) Enviar que ocorra o envio de cópias dos certificados HTTPS ao 
Observatório, o que nos ajuda
 a detectar o quot;homem no meioquot; destes ataques e melhorar a segurança 
da Web; e (2)
-Avisar-nos sobre conexões inseguras ou ataques ao seu navegador.
+Avisar-nos sobre as conexões inseguras ou ataques ao seu navegador.
 
 !--!ENTITY ssl-observatory.prefs.explanation2
 When you visit https://www.example.com, the Observatory will learn that

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

[tor-commits] [tor/maint-0.2.4] Fix automapping to ipv6

2013-12-22 Thread nickm 
commit b9f6e40ecbc9469abeefa7e73d724917d0bbcc24
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Dec 22 08:38:36 2013 -0500

Fix automapping to ipv6

Bugfix on 0.2.4.7-alpha; fixes bug 10465.
---
 changes/bug10465 |3 +++
 src/or/connection_edge.c |   46 ++
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/changes/bug10465 b/changes/bug10465
new file mode 100644
index 000..330f969
--- /dev/null
+++ b/changes/bug10465
@@ -0,0 +1,3 @@
+  o Major bugfixes:
+- Fix assertion failure when AutomapHostsOnResolve yields an IPv6
+  address. Fixes bug 10465; bugfix on 0.2.4.7-alpha.
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index bb7ffb9..3a72110 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -61,6 +61,11 @@ static int connection_ap_process_natd(entry_connection_t 
*conn);
 static int connection_exit_connect_dir(edge_connection_t *exitconn);
 static int consider_plaintext_ports(entry_connection_t *conn, uint16_t port);
 static int connection_ap_supports_optimistic_data(const entry_connection_t *);
+static void connection_ap_handshake_socks_resolved_addr(
+entry_connection_t *conn,
+const tor_addr_t *answer,
+int ttl,
+time_t expires);
 
 /** An AP stream has failed/finished. If it hasn't already sent back
  * a socks reply, send one now (based on endreason). Also set
@@ -1156,17 +1161,13 @@ 
connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
 }
 
 if (socks-command == SOCKS_COMMAND_RESOLVE) {
-  uint32_t answer;
-  struct in_addr in;
+  tor_addr_t answer;
   /* Reply to resolves immediately if we can. */
-  if (tor_inet_aton(socks-address, in)) { /* see if it's an IP already */
-/* leave it in network order */
-answer = in.s_addr;
+  if (tor_addr_parse(answer, socks-address) = 0) {/* is it an IP? */
 /* remember _what_ is supposed to have been resolved. */
 strlcpy(socks-address, orig_address, sizeof(socks-address));
-connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4,
-   (uint8_t*)answer,
-   -1,map_expires);
+connection_ap_handshake_socks_resolved_addr(conn, answer, -1,
+map_expires);
 connection_mark_unattached_ap(conn,
 END_STREAM_REASON_DONE |
 END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);
@@ -2059,6 +2060,35 @@ tell_controller_about_resolved_result(entry_connection_t 
*conn,
   }
 }
 
+/**
+ * As connection_ap_handshake_socks_resolved, but take a tor_addr_t to send
+ * as the answer.
+ */
+static void
+connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn,
+const tor_addr_t *answer,
+int ttl,
+time_t expires)
+{
+  if (tor_addr_family(answer) == AF_INET) {
+uint32_t a = tor_addr_to_ipv4n(answer); /* network order */
+connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4,
+   (uint8_t*)a,
+   ttl, expires);
+  } else if (tor_addr_family(answer) == AF_INET6) {
+const uint8_t *a = tor_addr_to_in6_addr8(answer);
+connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV6,16,
+   a,
+   ttl, expires);
+  } else {
+log_warn(LD_BUG, Got called with address of unexpected family %d,
+ tor_addr_family(answer));
+connection_ap_handshake_socks_resolved(conn,
+   RESOLVED_TYPE_ERROR,0,NULL,-1,-1);
+  }
+}
+
+
 /** Send an answer to an AP connection that has requested a DNS lookup via
  * SOCKS.  The type should be one of RESOLVED_TYPE_(IPV4|IPV6|HOSTNAME) or -1
  * for unreachable; the answer should be in the format specified in the socks



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

[tor-commits] [tor/maint-0.2.4] Merge branch 'bug10465' into maint-0.2.4

2013-12-22 Thread nickm 
commit 59a162f7d2048bc5e6bbc953c2bdc76a0367221b
Merge: 2c956f0 b9f6e40
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Dec 22 17:20:22 2013 -0500

Merge branch 'bug10465' into maint-0.2.4

 changes/bug10465 |3 +++
 src/or/connection_edge.c |   46 ++
 2 files changed, 41 insertions(+), 8 deletions(-)

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

[tor-commits] [tor/master] Fix automapping to ipv6

2013-12-22 Thread nickm 
commit b9f6e40ecbc9469abeefa7e73d724917d0bbcc24
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Dec 22 08:38:36 2013 -0500

Fix automapping to ipv6

Bugfix on 0.2.4.7-alpha; fixes bug 10465.
---
 changes/bug10465 |3 +++
 src/or/connection_edge.c |   46 ++
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/changes/bug10465 b/changes/bug10465
new file mode 100644
index 000..330f969
--- /dev/null
+++ b/changes/bug10465
@@ -0,0 +1,3 @@
+  o Major bugfixes:
+- Fix assertion failure when AutomapHostsOnResolve yields an IPv6
+  address. Fixes bug 10465; bugfix on 0.2.4.7-alpha.
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index bb7ffb9..3a72110 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -61,6 +61,11 @@ static int connection_ap_process_natd(entry_connection_t 
*conn);
 static int connection_exit_connect_dir(edge_connection_t *exitconn);
 static int consider_plaintext_ports(entry_connection_t *conn, uint16_t port);
 static int connection_ap_supports_optimistic_data(const entry_connection_t *);
+static void connection_ap_handshake_socks_resolved_addr(
+entry_connection_t *conn,
+const tor_addr_t *answer,
+int ttl,
+time_t expires);
 
 /** An AP stream has failed/finished. If it hasn't already sent back
  * a socks reply, send one now (based on endreason). Also set
@@ -1156,17 +1161,13 @@ 
connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
 }
 
 if (socks-command == SOCKS_COMMAND_RESOLVE) {
-  uint32_t answer;
-  struct in_addr in;
+  tor_addr_t answer;
   /* Reply to resolves immediately if we can. */
-  if (tor_inet_aton(socks-address, in)) { /* see if it's an IP already */
-/* leave it in network order */
-answer = in.s_addr;
+  if (tor_addr_parse(answer, socks-address) = 0) {/* is it an IP? */
 /* remember _what_ is supposed to have been resolved. */
 strlcpy(socks-address, orig_address, sizeof(socks-address));
-connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4,
-   (uint8_t*)answer,
-   -1,map_expires);
+connection_ap_handshake_socks_resolved_addr(conn, answer, -1,
+map_expires);
 connection_mark_unattached_ap(conn,
 END_STREAM_REASON_DONE |
 END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);
@@ -2059,6 +2060,35 @@ tell_controller_about_resolved_result(entry_connection_t 
*conn,
   }
 }
 
+/**
+ * As connection_ap_handshake_socks_resolved, but take a tor_addr_t to send
+ * as the answer.
+ */
+static void
+connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn,
+const tor_addr_t *answer,
+int ttl,
+time_t expires)
+{
+  if (tor_addr_family(answer) == AF_INET) {
+uint32_t a = tor_addr_to_ipv4n(answer); /* network order */
+connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4,
+   (uint8_t*)a,
+   ttl, expires);
+  } else if (tor_addr_family(answer) == AF_INET6) {
+const uint8_t *a = tor_addr_to_in6_addr8(answer);
+connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV6,16,
+   a,
+   ttl, expires);
+  } else {
+log_warn(LD_BUG, Got called with address of unexpected family %d,
+ tor_addr_family(answer));
+connection_ap_handshake_socks_resolved(conn,
+   RESOLVED_TYPE_ERROR,0,NULL,-1,-1);
+  }
+}
+
+
 /** Send an answer to an AP connection that has requested a DNS lookup via
  * SOCKS.  The type should be one of RESOLVED_TYPE_(IPV4|IPV6|HOSTNAME) or -1
  * for unreachable; the answer should be in the format specified in the socks



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

[tor-commits] [tor/master] Merge branch 'bug10465' into maint-0.2.4

2013-12-22 Thread nickm 
commit 59a162f7d2048bc5e6bbc953c2bdc76a0367221b
Merge: 2c956f0 b9f6e40
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Dec 22 17:20:22 2013 -0500

Merge branch 'bug10465' into maint-0.2.4

 changes/bug10465 |3 +++
 src/or/connection_edge.c |   46 ++
 2 files changed, 41 insertions(+), 8 deletions(-)



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

[tor-commits] [arm/master] Removing the get_chroot helper

2013-12-22 Thread atagar 
commit 19ad43d8c75768d6838642323d4078e5dc32017c
Author: Damian Johnson ata...@torproject.org
Date:   Sun Dec 22 15:12:35 2013 -0800

Removing the get_chroot helper

The get_chroot() function normalizes user supplied chroot paths and fetches 
one
if on FreeBSD. We might as well do this in the starter during initialization
rather than lazy evaluation.
---
 arm/graphing/bandwidthStats.py |4 +++-
 arm/logPanel.py|3 ++-
 arm/starter.py |   31 +++-
 arm/util/torConfig.py  |3 ++-
 arm/util/torTools.py   |   52 +---
 test/starter/authenticate.py   |   13 +-
 6 files changed, 40 insertions(+), 66 deletions(-)

diff --git a/arm/graphing/bandwidthStats.py b/arm/graphing/bandwidthStats.py
index e074716..2bf417e 100644
--- a/arm/graphing/bandwidthStats.py
+++ b/arm/graphing/bandwidthStats.py
@@ -23,6 +23,7 @@ CONFIG = conf.config_dict(arm, {
   features.graph.bw.accounting.show: True,
   features.graph.bw.accounting.rate: 10,
   features.graph.bw.accounting.isTimeLong: False,
+  tor.chroot: ,
 }, conf_handler)
 
 DL_COLOR, UL_COLOR = green, cyan
@@ -151,7 +152,8 @@ class BandwidthStats(graphPanel.GraphStats):
   return False
 
 # attempt to open the state file
-try: stateFile = open(%s%s/state % (torTools.get_chroot(), dataDir), r)
+try:
+  stateFile = open(%s%s/state % (CONFIG['tor.chroot'], dataDir), r)
 except IOError:
   msg = PREPOPULATE_FAILURE_MSG % unable to read the state file
   log.notice(msg)
diff --git a/arm/logPanel.py b/arm/logPanel.py
index 01b34f4..3b58125 100644
--- a/arm/logPanel.py
+++ b/arm/logPanel.py
@@ -57,6 +57,7 @@ CONFIG = conf.config_dict(arm, {
   features.log.regex: [],
   cache.logPanel.size: 1000,
   msg.event_types: '',
+  tor.chroot: '',
 }, conf_handler)
 
 DUPLICATE_MSG =  [%i duplicate%s hidden]
@@ -209,7 +210,7 @@ def getLogFileEntries(runlevels, readLimit = None, addLimit 
= None):
   if not loggingLocation: return []
 
   # includes the prefix for tor paths
-  loggingLocation = torTools.get_chroot() + loggingLocation
+  loggingLocation = CONFIG['tor.chroot'] + loggingLocation
 
   # if the runlevels argument is a superset of the log file then we can
   # limit the read contents to the addLimit
diff --git a/arm/starter.py b/arm/starter.py
index ca2179f..707317c 100644
--- a/arm/starter.py
+++ b/arm/starter.py
@@ -36,6 +36,7 @@ import stem.util.system
 SETTINGS_PATH = os.path.join(os.path.dirname(__file__), 'settings.cfg')
 
 CONFIG = stem.util.conf.config_dict(arm, {
+  'tor.chroot': '',
   'tor.password': None,
   'startup.events': 'N3',
   'msg.debug_header': '',
@@ -90,15 +91,14 @@ def _authenticate(controller, password):
   Authenticates to the given Controller.
 
   :param stem.control.Controller controller: controller to be authenticated to
-  :param str args: password to authenticate with, **None** if nothing was 
provided
+  :param str password: password to authenticate with, **None** if nothing was
+provided
 
   :raises: **ValueError** if unable to authenticate
   
 
-  chroot = arm.util.torTools.get_chroot()
-
   try:
-controller.authenticate(password = password, chroot_path = chroot)
+controller.authenticate(password = password, chroot_path = 
CONFIG['tor.chroot'])
   except stem.connection.IncorrectSocketType:
 control_socket = controller.get_socket()
 
@@ -127,7 +127,7 @@ def _setup_debug_logging(args):
   Configures us to log at stem's trace level to debug log path, and notes some
   general diagnostic information.
 
-  :param namedtuple args: startup arguments
+  :param namedtuple args: arguments that arm was started with
 
   :raises: **IOError** if we can't log to this location
   
@@ -229,7 +229,17 @@ def main():
   else:
 stem.util.log.notice(CONFIG['msg.config_not_found'].format(path = 
args.config))
 
-  config.set(startup.events, args.logged_events)
+  config.set('startup.events', args.logged_events)
+
+  # check that the chroot exists and strip trailing slashes
+
+  chroot = CONFIG['tor.chroot'].strip().rstrip(os.path.sep)
+
+  if chroot and not os.path.exists(chroot):
+stem.util.log.notice(The chroot path set in your config (%s) doesn't 
exist. % chroot)
+config.set('tor.chroot', '')
+  else:
+config.set('tor.chroot', chroot)  # use the normalized path
 
   # validates and expands log event flags
 
@@ -289,6 +299,15 @@ def main():
   except ValueError:
 stem.util.log.warn(CONFIG['msg.unable_to_determine_pid'])
 
+  # If we're running under FreeBSD then check the system for a chroot path.
+
+  if not CONFIG['tor.chroot'] and platform.system() == 'FreeBSD':
+jail_chroot = stem.util.system.get_bsd_jail_path(controller.get_pid(0))
+
+if jail_chroot and os.path.exists(jail_chroot):
+  stem.util.log.info(Adjusting paths to account for Tor running in a 
FreeBSD jail at: %s % jail_chroot)
+  config.set('tor.chroot', jail_chroot)
+
   # If

[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

2013-12-22 Thread arma 
commit ce43072831250eb5e0a089bd2cf092c34701eebf
Merge: 9f7be02 59a162f
Author: Roger Dingledine a...@torproject.org
Date:   Sun Dec 22 18:31:50 2013 -0500

Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bug10465 |3 +++
 src/or/connection_edge.c |   46 ++
 2 files changed, 41 insertions(+), 8 deletions(-)

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

[tor-commits] [tor/release-0.2.4] Fix automapping to ipv6

2013-12-22 Thread arma 
commit b9f6e40ecbc9469abeefa7e73d724917d0bbcc24
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Dec 22 08:38:36 2013 -0500

Fix automapping to ipv6

Bugfix on 0.2.4.7-alpha; fixes bug 10465.
---
 changes/bug10465 |3 +++
 src/or/connection_edge.c |   46 ++
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/changes/bug10465 b/changes/bug10465
new file mode 100644
index 000..330f969
--- /dev/null
+++ b/changes/bug10465
@@ -0,0 +1,3 @@
+  o Major bugfixes:
+- Fix assertion failure when AutomapHostsOnResolve yields an IPv6
+  address. Fixes bug 10465; bugfix on 0.2.4.7-alpha.
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index bb7ffb9..3a72110 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -61,6 +61,11 @@ static int connection_ap_process_natd(entry_connection_t 
*conn);
 static int connection_exit_connect_dir(edge_connection_t *exitconn);
 static int consider_plaintext_ports(entry_connection_t *conn, uint16_t port);
 static int connection_ap_supports_optimistic_data(const entry_connection_t *);
+static void connection_ap_handshake_socks_resolved_addr(
+entry_connection_t *conn,
+const tor_addr_t *answer,
+int ttl,
+time_t expires);
 
 /** An AP stream has failed/finished. If it hasn't already sent back
  * a socks reply, send one now (based on endreason). Also set
@@ -1156,17 +1161,13 @@ 
connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
 }
 
 if (socks-command == SOCKS_COMMAND_RESOLVE) {
-  uint32_t answer;
-  struct in_addr in;
+  tor_addr_t answer;
   /* Reply to resolves immediately if we can. */
-  if (tor_inet_aton(socks-address, in)) { /* see if it's an IP already */
-/* leave it in network order */
-answer = in.s_addr;
+  if (tor_addr_parse(answer, socks-address) = 0) {/* is it an IP? */
 /* remember _what_ is supposed to have been resolved. */
 strlcpy(socks-address, orig_address, sizeof(socks-address));
-connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4,
-   (uint8_t*)answer,
-   -1,map_expires);
+connection_ap_handshake_socks_resolved_addr(conn, answer, -1,
+map_expires);
 connection_mark_unattached_ap(conn,
 END_STREAM_REASON_DONE |
 END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);
@@ -2059,6 +2060,35 @@ tell_controller_about_resolved_result(entry_connection_t 
*conn,
   }
 }
 
+/**
+ * As connection_ap_handshake_socks_resolved, but take a tor_addr_t to send
+ * as the answer.
+ */
+static void
+connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn,
+const tor_addr_t *answer,
+int ttl,
+time_t expires)
+{
+  if (tor_addr_family(answer) == AF_INET) {
+uint32_t a = tor_addr_to_ipv4n(answer); /* network order */
+connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4,
+   (uint8_t*)a,
+   ttl, expires);
+  } else if (tor_addr_family(answer) == AF_INET6) {
+const uint8_t *a = tor_addr_to_in6_addr8(answer);
+connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV6,16,
+   a,
+   ttl, expires);
+  } else {
+log_warn(LD_BUG, Got called with address of unexpected family %d,
+ tor_addr_family(answer));
+connection_ap_handshake_socks_resolved(conn,
+   RESOLVED_TYPE_ERROR,0,NULL,-1,-1);
+  }
+}
+
+
 /** Send an answer to an AP connection that has requested a DNS lookup via
  * SOCKS.  The type should be one of RESOLVED_TYPE_(IPV4|IPV6|HOSTNAME) or -1
  * for unreachable; the answer should be in the format specified in the socks



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

[tor-commits] [tor/release-0.2.4] Merge branch 'bug10465' into maint-0.2.4

2013-12-22 Thread arma 
commit 59a162f7d2048bc5e6bbc953c2bdc76a0367221b
Merge: 2c956f0 b9f6e40
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Dec 22 17:20:22 2013 -0500

Merge branch 'bug10465' into maint-0.2.4

 changes/bug10465 |3 +++
 src/or/connection_edge.c |   46 ++
 2 files changed, 41 insertions(+), 8 deletions(-)



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

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

2013-12-22 Thread translation 
commit d9db40c17f7c3e601b48d9c191a064c4ede4672b
Author: Translation commit bot translat...@torproject.org
Date:   Mon Dec 23 03:15:58 2013 +

Update translations for https_everywhere
---
 pt_BR/https-everywhere.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd
index e25a756..7e5c77a 100644
--- a/pt_BR/https-everywhere.dtd
+++ b/pt_BR/https-everywhere.dtd
@@ -7,7 +7,7 @@
 !ENTITY https-everywhere.about.thanks Obrigado a
 !ENTITY https-everywhere.about.contribute  Se você gostar do HTTPS 
Everywhere, considere
 !ENTITY https-everywhere.about.donate_tor Fazer uma doação para o Tor
-!ENTITY https-everywhere.about.tor_lang_code en
+!ENTITY https-everywhere.about.tor_lang_code pt_BR
 !ENTITY https-everywhere.about.donate_eff Fazer uma doação ao EFF
 
 !ENTITY https-everywhere.menu.about Sobre o HTTPS Everywhere

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

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

2013-12-22 Thread translation 
commit 4fe31c8fb339d440ed32359f861f4c54169661fc
Author: Translation commit bot translat...@torproject.org
Date:   Mon Dec 23 03:15:44 2013 +

Update translations for vidalia_installer
---
 pt_BR/vidalia_pt_BR.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pt_BR/vidalia_pt_BR.po b/pt_BR/vidalia_pt_BR.po
index 1ad0dcf..c2fd350 100755
--- a/pt_BR/vidalia_pt_BR.po
+++ b/pt_BR/vidalia_pt_BR.po
@@ -1,14 +1,14 @@
 # 
 # Translators:
-# m4lqu1570 , 2012
+# Snake Plissken , 2012
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
+Report-Msgid-Bugs-To: translati...@vidalia-project.net\n
 POT-Creation-Date: 2008-07-12 05:29+\n
-PO-Revision-Date: 2013-04-29 09:24+\n
+PO-Revision-Date: 2013-12-23 03:10+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
-Language-Team: translati...@vidalia-project.net\n
+Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n

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

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

2013-12-22 Thread translation 
commit d14d3c456427505f9a5e886d8b12eb36d432489e
Author: Translation commit bot translat...@torproject.org
Date:   Mon Dec 23 03:15:50 2013 +

Update translations for vidalia_installer_completed
---
 pt_BR/vidalia_pt_BR.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pt_BR/vidalia_pt_BR.po b/pt_BR/vidalia_pt_BR.po
index 1ad0dcf..c2fd350 100644
--- a/pt_BR/vidalia_pt_BR.po
+++ b/pt_BR/vidalia_pt_BR.po
@@ -1,14 +1,14 @@
 # 
 # Translators:
-# m4lqu1570 , 2012
+# Snake Plissken , 2012
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
+Report-Msgid-Bugs-To: translati...@vidalia-project.net\n
 POT-Creation-Date: 2008-07-12 05:29+\n
-PO-Revision-Date: 2013-04-29 09:24+\n
+PO-Revision-Date: 2013-12-23 03:10+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
-Language-Team: translati...@vidalia-project.net\n
+Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n

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

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

2013-12-22 Thread translation 
commit 503352cad689e906bbe8729b07dff952bfe0f1d0
Author: Translation commit bot translat...@torproject.org
Date:   Mon Dec 23 04:45:52 2013 +

Update translations for https_everywhere
---
 ml/https-everywhere.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ml/https-everywhere.properties b/ml/https-everywhere.properties
index 21feda9..1d30527 100644
--- a/ml/https-everywhere.properties
+++ b/ml/https-everywhere.properties
@@ -1,5 +1,5 @@
-# https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
-# https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
+https-everywhere.menu.globalEnable = എല്ലായിടത്തും 
എച്ച്ടിടിപിഎസ് 
പ്രാപ്തമാക്കുക
+https-everywhere.menu.globalDisable = എല്ലായിടത്തും 
എച്ച്ടിടിപിഎസ് പ്രവര്‍ത്തന 
രഹിതമാക്കുക
 # https-everywhere.menu.enableDisable = Enable / Disable Rules
 # https-everywhere.menu.noRules = (No Rules for This Page)
 # https-everywhere.menu.unknownRules = (Rules for This Page Unknown)

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

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

2013-12-22 Thread translation 
commit 88c8dde6fbdaab179215451df57b3038ea3a4795
Author: Translation commit bot translat...@torproject.org
Date:   Mon Dec 23 05:15:52 2013 +

Update translations for https_everywhere
---
 ml/https-everywhere.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ml/https-everywhere.dtd b/ml/https-everywhere.dtd
index 33cd86d..88e5642 100644
--- a/ml/https-everywhere.dtd
+++ b/ml/https-everywhere.dtd
@@ -12,8 +12,8 @@
 
 !ENTITY https-everywhere.menu.about About HTTPS Everywhere
 !ENTITY https-everywhere.menu.observatory SSL Observatory Preferences
-!ENTITY https-everywhere.menu.globalEnable Enable HTTPS Everywhere
-!ENTITY https-everywhere.menu.globalDisable Disable HTTPS Everywhere
+!ENTITY https-everywhere.menu.globalEnable 
എല്ലായിടത്തും 
എച്ച്ടിടിപിഎസ് 
പ്രാപ്തമാക്കുക
+!ENTITY https-everywhere.menu.globalDisable 
എല്ലായിടത്തും 
എച്ച്ടിടിപിഎസ് പ്രവര്‍ത്തന 
രഹിതമാക്കുക
 
 !ENTITY https-everywhere.prefs.title HTTPS Everywhere Preferences
 !ENTITY https-everywhere.prefs.enable_all Enable All

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

[tor-commits] r26509: {website} new stable is 0.2.4.20 (in website/trunk: . include)

2013-12-22 Thread Roger Dingledine 
Author: arma
Date: 2013-12-23 06:43:16 + (Mon, 23 Dec 2013)
New Revision: 26509

Modified:
   website/trunk/Makefile
   website/trunk/include/versions.wmi
Log:
new stable is 0.2.4.20


Modified: website/trunk/Makefile
===
--- website/trunk/Makefile  2013-12-22 18:15:02 UTC (rev 26508)
+++ website/trunk/Makefile  2013-12-23 06:43:16 UTC (rev 26509)
@@ -10,7 +10,7 @@
 # 4. make
 # 5. ./publish
 
-export STABLETAG=tor-0.2.4.19
+export STABLETAG=tor-0.2.4.20
 export DEVTAG=tor-0.2.5.1-alpha
 
 WMLBASE=.

Modified: website/trunk/include/versions.wmi
===
--- website/trunk/include/versions.wmi  2013-12-22 18:15:02 UTC (rev 26508)
+++ website/trunk/include/versions.wmi  2013-12-23 06:43:16 UTC (rev 26509)
@@ -1,4 +1,4 @@
-define-tag version-stable whitespace=delete0.2.4.19/define-tag
+define-tag version-stable whitespace=delete0.2.4.20/define-tag
 define-tag version-alpha whitespace=delete0.2.5.1-alpha/define-tag
 
 define-tag version-win32-stable whitespace=delete0.2.3.25/define-tag

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

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

2013-12-22 Thread translation 
commit b2c38a28186d020f21e90abeb7790182c59618b0
Author: Translation commit bot translat...@torproject.org
Date:   Mon Dec 23 07:45:57 2013 +

Update translations for https_everywhere_completed
---
 pt_BR/https-everywhere.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd
index 7e5c77a..34969fe 100644
--- a/pt_BR/https-everywhere.dtd
+++ b/pt_BR/https-everywhere.dtd
@@ -37,7 +37,7 @@
 !ENTITY https-everywhere.popup.title Aviso do HTTPS Everywhere 
4.0development.11
 !ENTITY https-everywhere.popup.paragraph1 Desculpe. Você estava usando a 
versão estável do HTTPS Everywhere, mas, ao lançar nossa última versão, 
sem querer podemos ter atualizado seu navegador para a versão de 
desenvolvimento.
 !ENTITY https-everywhere.popup.paragraph2 Você gostaria de voltar à 
versão estável?
-!ENTITY https-everywhere.popup.paragraph3 Seria útil para o nosso projeto 
se quiser continuar a usar a versão de desenvolvimento para ajudar-nos a 
melhorar o HTTPS Everywhere. Porém, pode encontrar mais bugs; pode informar 
sobre eles escrevendo para https-everywh...@eff.org. Desculpe pelo incômodo, e 
obrigado por usar o HTTPS Everywhere.
+!ENTITY https-everywhere.popup.paragraph3 Nós adoraríamos se você 
continuasse usando o nosso lt;bgt;lançamento de desenvolvimentolt;/bgt; e 
nos ajudasse a fazer o lt;bgt;HTTPS Everywherelt;/bgt; ainda melhor! 
Durante o seu uso, se você encontrar alguns erros de bug aqui e ali, você 
pode enviar o seu reporte para o lt;a 
href=quot;mailto:https-everywh...@eff.orgquot;gt;https-everywh...@eff.orglt;/agt;.
 Desculpe o transtorno e obrigado por usar o HTTPS Everywhere.
 !ENTITY https-everywhere.popup.keep Manter o navegador na versão de 
desenvolvimento
 !ENTITY https-everywhere.popup.revert Fazer download da versão estável 
mais recente
 

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

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

2013-12-22 Thread translation 
commit 9fd223fc3846b283864a435dcd3c6bd22dee37dc
Author: Translation commit bot translat...@torproject.org
Date:   Mon Dec 23 07:45:52 2013 +

Update translations for https_everywhere
---
 pt_BR/https-everywhere.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd
index 7e5c77a..34969fe 100644
--- a/pt_BR/https-everywhere.dtd
+++ b/pt_BR/https-everywhere.dtd
@@ -37,7 +37,7 @@
 !ENTITY https-everywhere.popup.title Aviso do HTTPS Everywhere 
4.0development.11
 !ENTITY https-everywhere.popup.paragraph1 Desculpe. Você estava usando a 
versão estável do HTTPS Everywhere, mas, ao lançar nossa última versão, 
sem querer podemos ter atualizado seu navegador para a versão de 
desenvolvimento.
 !ENTITY https-everywhere.popup.paragraph2 Você gostaria de voltar à 
versão estável?
-!ENTITY https-everywhere.popup.paragraph3 Seria útil para o nosso projeto 
se quiser continuar a usar a versão de desenvolvimento para ajudar-nos a 
melhorar o HTTPS Everywhere. Porém, pode encontrar mais bugs; pode informar 
sobre eles escrevendo para https-everywh...@eff.org. Desculpe pelo incômodo, e 
obrigado por usar o HTTPS Everywhere.
+!ENTITY https-everywhere.popup.paragraph3 Nós adoraríamos se você 
continuasse usando o nosso lt;bgt;lançamento de desenvolvimentolt;/bgt; e 
nos ajudasse a fazer o lt;bgt;HTTPS Everywherelt;/bgt; ainda melhor! 
Durante o seu uso, se você encontrar alguns erros de bug aqui e ali, você 
pode enviar o seu reporte para o lt;a 
href=quot;mailto:https-everywh...@eff.orgquot;gt;https-everywh...@eff.orglt;/agt;.
 Desculpe o transtorno e obrigado por usar o HTTPS Everywhere.
 !ENTITY https-everywhere.popup.keep Manter o navegador na versão de 
desenvolvimento
 !ENTITY https-everywhere.popup.revert Fazer download da versão estável 
mais recente
 

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