date:20150929

[tor-commits] [tor/master] FreeBSD needs -lexecinfo to get backtrace()

2015-09-29 Thread nickm

commit 00e15ba4772bb11c00e88f9e263966c856f1f275
Author: Marcin CieÅlak 
Date:   Fri Sep 25 00:59:59 2015 +

FreeBSD needs -lexecinfo to get backtrace()
---
 configure.ac |1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index b190522..24de46e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -360,6 +360,7 @@ AC_SEARCH_LIBS(socket, [socket network])
 AC_SEARCH_LIBS(gethostbyname, [nsl])
 AC_SEARCH_LIBS(dlopen, [dl])
 AC_SEARCH_LIBS(inet_aton, [resolv])
+AC_SEARCH_LIBS(backtrace, [execinfo])
 saved_LIBS="$LIBS"
 AC_SEARCH_LIBS([clock_gettime], [rt])
 if test "$LIBS" != "$saved_LIBS"; then



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

[tor-commits] [tor/master] Add changes file for bug17151

2015-09-29 Thread nickm

commit 546d70dc7c5c2fd6687d3aaa0ff3c52c6c7dc4de
Author: Nick Mathewson 
Date:   Tue Sep 29 10:08:02 2015 +0200

Add changes file for bug17151
---
 changes/bug17151 |7 +++
 1 file changed, 7 insertions(+)

diff --git a/changes/bug17151 b/changes/bug17151
new file mode 100644
index 000..0993b90
--- /dev/null
+++ b/changes/bug17151
@@ -0,0 +1,7 @@
+  o Minor bugfixes (portability):
+- Use libexecinfo on FreeBSD, to enable backtrace support. Fixes part of
+  bug 17151; bugfix on 0.2.5.2-alpha. Patch from Marcin CieÅlak.
+
+  o Minor bugfixes (testing):
+- Skip backtrace tests when backtrace support is not compiled in. Fixes
+  part of bug 17151; bugfix on 0.2.7.1-alpha. Patch from Marcin CieÅlak.



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

[tor-commits] [tor/master] Socks->SOCKS in torrcs. Fixes 15609

2015-09-29 Thread nickm

commit 87dee5c6517e23dc9358db0aeb994913ca156672
Author: Nick Mathewson 
Date:   Tue Sep 29 10:20:31 2015 +0200

Socks->SOCKS in torrcs. Fixes 15609
---
 changes/bug15609|2 ++
 src/config/torrc.minimal.in-staging |   20 ++--
 src/config/torrc.sample.in  |   20 ++--
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/changes/bug15609 b/changes/bug15609
new file mode 100644
index 000..efaccde
--- /dev/null
+++ b/changes/bug15609
@@ -0,0 +1,2 @@
+  o Documentation:
+- Fix capitalization of SOCKS in sample torrc. Closes ticket 15609.
diff --git a/src/config/torrc.minimal.in-staging 
b/src/config/torrc.minimal.in-staging
index ff324a9..248cb5c 100644
--- a/src/config/torrc.minimal.in-staging
+++ b/src/config/torrc.minimal.in-staging
@@ -12,20 +12,20 @@
 ## Tor will look for this file in various places based on your platform:
 ## https://www.torproject.org/docs/faq#torrc
 
-## Tor opens a socks proxy on port 9050 by default -- even if you don't
-## configure one below. Set "SocksPort 0" if you plan to run Tor only
+## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't
+## configure one below. Set "SOCKSPort 0" if you plan to run Tor only
 ## as a relay, and not make any local application connections yourself.
-#SocksPort 9050 # Default: Bind to localhost:9050 for local connections.
-#SocksPort 192.168.0.1:9100 # Bind to this address:port too.
+#SOCKSPort 9050 # Default: Bind to localhost:9050 for local connections.
+#SOCKSPort 192.168.0.1:9100 # Bind to this address:port too.
 
 ## Entry policies to allow/deny SOCKS requests based on IP address.
-## First entry that matches wins. If no SocksPolicy is set, we accept
-## all (and only) requests that reach a SocksPort. Untrusted users who
-## can access your SocksPort may be able to learn about the connections
+## First entry that matches wins. If no SOCKSPolicy is set, we accept
+## all (and only) requests that reach a SOCKSPort. Untrusted users who
+## can access your SOCKSPort may be able to learn about the connections
 ## you make.
-#SocksPolicy accept 192.168.0.0/16
-#SocksPolicy accept6 FC00::/7
-#SocksPolicy reject *
+#SOCKSPolicy accept 192.168.0.0/16
+#SOCKSPolicy accept6 FC00::/7
+#SOCKSPolicy reject *
 
 ## Logs go to stdout at level "notice" unless redirected by something
 ## else, like one of the below lines. You can have as many Log lines as
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index ff324a9..248cb5c 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -12,20 +12,20 @@
 ## Tor will look for this file in various places based on your platform:
 ## https://www.torproject.org/docs/faq#torrc
 
-## Tor opens a socks proxy on port 9050 by default -- even if you don't
-## configure one below. Set "SocksPort 0" if you plan to run Tor only
+## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't
+## configure one below. Set "SOCKSPort 0" if you plan to run Tor only
 ## as a relay, and not make any local application connections yourself.
-#SocksPort 9050 # Default: Bind to localhost:9050 for local connections.
-#SocksPort 192.168.0.1:9100 # Bind to this address:port too.
+#SOCKSPort 9050 # Default: Bind to localhost:9050 for local connections.
+#SOCKSPort 192.168.0.1:9100 # Bind to this address:port too.
 
 ## Entry policies to allow/deny SOCKS requests based on IP address.
-## First entry that matches wins. If no SocksPolicy is set, we accept
-## all (and only) requests that reach a SocksPort. Untrusted users who
-## can access your SocksPort may be able to learn about the connections
+## First entry that matches wins. If no SOCKSPolicy is set, we accept
+## all (and only) requests that reach a SOCKSPort. Untrusted users who
+## can access your SOCKSPort may be able to learn about the connections
 ## you make.
-#SocksPolicy accept 192.168.0.0/16
-#SocksPolicy accept6 FC00::/7
-#SocksPolicy reject *
+#SOCKSPolicy accept 192.168.0.0/16
+#SOCKSPolicy accept6 FC00::/7
+#SOCKSPolicy reject *
 
 ## Logs go to stdout at level "notice" unless redirected by something
 ## else, like one of the below lines. You can have as many Log lines as



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

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

2015-09-29 Thread nickm

commit efff55bdfd45e1587d074430ffe5a8a775a35bf5
Merge: 8e93cfb c198195
Author: Nick Mathewson 
Date:   Tue Sep 29 10:22:38 2015 +0200

Merge remote-tracking branch 'origin/maint-0.2.7'

 ChangeLog   |2 +-
 changes/bug15609|2 ++
 src/config/torrc.minimal.in-staging |   20 ++--
 src/config/torrc.sample.in  |   20 ++--
 4 files changed, 23 insertions(+), 21 deletions(-)

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

[tor-commits] [tor/master] go back in time to fix a changelog entry. Fix for 17165

2015-09-29 Thread nickm

commit c1981955ffe1d504b920ad1a1d10b83057d35660
Author: Nick Mathewson 
Date:   Tue Sep 29 10:21:52 2015 +0200

go back in time to fix a changelog entry. Fix for 17165
---
 ChangeLog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 25c7442..0191717 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,7 +61,7 @@ Changes in version 0.2.7.3-rc - 2015-09-25
   Fixes bug 16685; bugfix on 0.2.7.2-alpha. Reported by "s7r".
 
   o Minor features (client-side privacy):
-- New KeyAliveSOCKSAuth option to indefinitely extend circuit
+- New KeyepAliveIsolateSOCKSAuth option to indefinitely extend circuit
   lifespan when IsolateSOCKSAuth and streams with SOCKS
   authentication are attached to the circuit. This allows
   applications like TorBrowser to manage circuit lifetime on their



___
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.7] FreeBSD needs -lexecinfo to get backtrace()

2015-09-29 Thread nickm

commit 00e15ba4772bb11c00e88f9e263966c856f1f275
Author: Marcin CieÅlak 
Date:   Fri Sep 25 00:59:59 2015 +

FreeBSD needs -lexecinfo to get backtrace()
---
 configure.ac |1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index b190522..24de46e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -360,6 +360,7 @@ AC_SEARCH_LIBS(socket, [socket network])
 AC_SEARCH_LIBS(gethostbyname, [nsl])
 AC_SEARCH_LIBS(dlopen, [dl])
 AC_SEARCH_LIBS(inet_aton, [resolv])
+AC_SEARCH_LIBS(backtrace, [execinfo])
 saved_LIBS="$LIBS"
 AC_SEARCH_LIBS([clock_gettime], [rt])
 if test "$LIBS" != "$saved_LIBS"; then



___
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.7] Add changes file for bug17151

2015-09-29 Thread nickm

commit 546d70dc7c5c2fd6687d3aaa0ff3c52c6c7dc4de
Author: Nick Mathewson 
Date:   Tue Sep 29 10:08:02 2015 +0200

Add changes file for bug17151
---
 changes/bug17151 |7 +++
 1 file changed, 7 insertions(+)

diff --git a/changes/bug17151 b/changes/bug17151
new file mode 100644
index 000..0993b90
--- /dev/null
+++ b/changes/bug17151
@@ -0,0 +1,7 @@
+  o Minor bugfixes (portability):
+- Use libexecinfo on FreeBSD, to enable backtrace support. Fixes part of
+  bug 17151; bugfix on 0.2.5.2-alpha. Patch from Marcin CieÅlak.
+
+  o Minor bugfixes (testing):
+- Skip backtrace tests when backtrace support is not compiled in. Fixes
+  part of bug 17151; bugfix on 0.2.7.1-alpha. Patch from Marcin CieÅlak.

___
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.7] Skip tests if backtrace support not compiled-in

2015-09-29 Thread nickm

commit 5c95762ec6c8e43fe7bc5582fd43585076214ba4
Author: Marcin CieÅlak 
Date:   Thu Sep 24 22:32:51 2015 +

Skip tests if backtrace support not compiled-in

FreeBSD needs -lexecinfo to fully support
backtrace reporting.
---
 src/test/test_bt.sh   |1 +
 src/test/test_bt_cl.c |   11 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/test/test_bt.sh b/src/test/test_bt.sh
index 56e6cc4..f55f451 100755
--- a/src/test/test_bt.sh
+++ b/src/test/test_bt.sh
@@ -3,6 +3,7 @@
 
 exitcode=0
 
+"${builddir:-.}/src/test/test-bt-cl" backtraces || exit 77
 "${builddir:-.}/src/test/test-bt-cl" assert | "${PYTHON:-python}" 
"${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode=1
 "${builddir:-.}/src/test/test-bt-cl" crash  | "${PYTHON:-python}" 
"${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode=1
 
diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c
index 01c621e..dabaee6 100644
--- a/src/test/test_bt_cl.c
+++ b/src/test/test_bt_cl.c
@@ -84,15 +84,24 @@ main(int argc, char **argv)
 
   if (argc < 2) {
 puts("I take an argument. It should be \"assert\" or \"crash\" or "
- "\"none\"");
+ "\"backtraces\" or \"none\"");
 return 1;
   }
+
+#if !(defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \
+   defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION))
+puts("Backtrace reporting is not supported on this platform");
+return 77;
+#endif
+
   if (!strcmp(argv[1], "assert")) {
 crashtype = 1;
   } else if (!strcmp(argv[1], "crash")) {
 crashtype = 0;
   } else if (!strcmp(argv[1], "none")) {
 crashtype = -1;
+  } else if (!strcmp(argv[1], "backtraces")) {
+return 0;
   } else {
 puts("Argument should be \"assert\" or \"crash\" or \"none\"");
 return 1;



___
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.7] get_interface_address6_list(): Bring back a return code check

2015-09-29 Thread nickm

commit 3ea834ce0a63f275fd806f9ebeec64a2bbcd1b55
Author: Fabian Keil 
Date:   Mon Sep 28 16:57:07 2015 +0200

get_interface_address6_list(): Bring back a return code check

... that was removed by 31eb486c46 which first appeared in
0.2.7.3-rc.

If tor is running in a ElectroBSD (or FreeBSD) jail it can't
get any IP addresses that aren't assigned to the jail by
looking at the interfaces and (by design) the
get_interface_address6_via_udp_socket_hack() fallback doesn't
work either.

The missing return code check resulted in tor_addr_is_internal()
complaining about a "non-IP address of type 49", due to reading
uninitialised memory.

Fixes #17173.
---
 src/common/address.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/address.c b/src/common/address.c
index 163db59..fc85f8e 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -1711,7 +1711,8 @@ MOCK_IMPL(smartlist_t *,get_interface_address6_list,(int 
severity,
   }
 
   /* Okay, the smart way is out. */
-  get_interface_address6_via_udp_socket_hack(severity,family,);
+  if (get_interface_address6_via_udp_socket_hack(severity,family,))
+ return smartlist_new();
   if (!include_internal && tor_addr_is_internal(, 0)) {
 return smartlist_new();
   } else {



___
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.7] Add checks and unit tests for get_interface_address* failure

2015-09-29 Thread nickm

commit 7fa102b48783b51673095e1ddcb2f88050a2ba32
Author: teor (Tim Wilson-Brown) 
Date:   Tue Sep 29 07:04:49 2015 +0200

Add checks and unit tests for get_interface_address* failure

Ensure that either a valid address is returned in address pointers,
or that the address data is zeroed on error.

Ensure that free_interface_address6_list handles NULL lists.

Add unit tests for get_interface_address* failure cases.

Fixes bug #17173.
Patch by fk/teor, not in any released version of tor.
---
 changes/bug17173-socket-hack-rv |   10 +
 src/common/address.c|   24 ++
 src/common/address.h|8 ++--
 src/test/test_address.c |   95 +++
 4 files changed, 125 insertions(+), 12 deletions(-)

diff --git a/changes/bug17173-socket-hack-rv b/changes/bug17173-socket-hack-rv
new file mode 100644
index 000..c9f30d3
--- /dev/null
+++ b/changes/bug17173-socket-hack-rv
@@ -0,0 +1,10 @@
+  o Minor bug fixes (addresses, testing):
+- Handle errors in get_interface_address6_via_udp_socket_hack by
+  returning an empty list (no addresses found). This bug was triggered
+  in ElectroBSD/FreeBSD jails.
+- Ensure that either a valid address is returned in address pointers,
+  or that the address data is zeroed on error.
+- Ensure that free_interface_address6_list handles NULL lists.
+- Add unit tests for get_interface_address* failure cases.
+  Fixes bug #17173.
+  Patch by fk/teor, not in any released version of tor.
diff --git a/src/common/address.c b/src/common/address.c
index fc85f8e..cfa8fd1 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -1506,8 +1506,8 @@ get_interface_addresses_ioctl(int severity)
  * Return a new smartlist of tor_addr_t on success, and NULL on failure.
  * (An empty smartlist indicates that we successfully learned that we have no
  * addresses.)  Log failure messages at severity. */
-STATIC smartlist_t *
-get_interface_addresses_raw(int severity)
+MOCK_IMPL(smartlist_t *,
+get_interface_addresses_raw,(int severity))
 {
   smartlist_t *result = NULL;
 #if defined(HAVE_IFADDRS_TO_SMARTLIST)
@@ -1547,10 +1547,10 @@ tor_addr_is_multicast(const tor_addr_t *a)
  * UDP socket trickery. Only look for address of given family.
  * Set result to *addr. Return 0 on success, -1 on failure.
  */
-STATIC int
-get_interface_address6_via_udp_socket_hack(int severity,
-   sa_family_t family,
-   tor_addr_t *addr)
+MOCK_IMPL(int,
+get_interface_address6_via_udp_socket_hack,(int severity,
+sa_family_t family,
+tor_addr_t *addr))
 {
   struct sockaddr_storage my_addr, target_addr;
   int sock=-1, r=-1;
@@ -1614,6 +1614,8 @@ get_interface_address6_via_udp_socket_hack(int severity,
  err:
   if (sock >= 0)
 tor_close_socket(sock);
+  if (r == -1)
+memset(addr, 0, sizeof(tor_addr_t));
   return r;
 }
 
@@ -1632,6 +1634,8 @@ get_interface_address6,(int severity, sa_family_t family, 
tor_addr_t *addr))
   int rv = -1;
   tor_assert(addr);
 
+  memset(addr, 0, sizeof(tor_addr_t));
+
   /* Get a list of public or internal IPs in arbitrary order */
   addrs = get_interface_address6_list(severity, family, 1);
 
@@ -1656,8 +1660,10 @@ get_interface_address6,(int severity, sa_family_t 
family, tor_addr_t *addr))
 void
 free_interface_address6_list(smartlist_t *addrs)
 {
-  SMARTLIST_FOREACH(addrs, tor_addr_t *, a, tor_free(a));
-  smartlist_free(addrs);
+  if (addrs != NULL) {
+SMARTLIST_FOREACH(addrs, tor_addr_t *, a, tor_free(a));
+smartlist_free(addrs);
+  }
 }
 
 /** Return a smartlist of the IP addresses of type family from all interfaces
@@ -1975,6 +1981,8 @@ get_interface_address,(int severity, uint32_t *addr))
   tor_addr_t local_addr;
   int r;
 
+  memset(addr, 0, sizeof(uint32_t));
+
   r = get_interface_address6(severity, AF_INET, _addr);
   if (r>=0)
 *addr = tor_addr_to_ipv4h(_addr);
diff --git a/src/common/address.h b/src/common/address.h
index 7d49fb5..d2841e1 100644
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -310,11 +310,11 @@ get_interface_address_list(int severity, int 
include_internal)
 tor_addr_port_t *tor_addr_port_new(const tor_addr_t *addr, uint16_t port);
 
 #ifdef ADDRESS_PRIVATE
-STATIC smartlist_t *get_interface_addresses_raw(int severity);
+MOCK_DECL(smartlist_t *,get_interface_addresses_raw,(int severity));
 STATIC int tor_addr_is_multicast(const tor_addr_t *a);
-STATIC int get_interface_address6_via_udp_socket_hack(int severity,
-  sa_family_t family,
-  tor_addr_t *addr);
+MOCK_DECL(int,get_interface_address6_via_udp_socket_hack,(int severity,
+  sa_family_t

[tor-commits] [tor/maint-0.2.7] Socks->SOCKS in torrcs. Fixes 15609

2015-09-29 Thread nickm

commit 87dee5c6517e23dc9358db0aeb994913ca156672
Author: Nick Mathewson 
Date:   Tue Sep 29 10:20:31 2015 +0200

Socks->SOCKS in torrcs. Fixes 15609
---
 changes/bug15609|2 ++
 src/config/torrc.minimal.in-staging |   20 ++--
 src/config/torrc.sample.in  |   20 ++--
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/changes/bug15609 b/changes/bug15609
new file mode 100644
index 000..efaccde
--- /dev/null
+++ b/changes/bug15609
@@ -0,0 +1,2 @@
+  o Documentation:
+- Fix capitalization of SOCKS in sample torrc. Closes ticket 15609.
diff --git a/src/config/torrc.minimal.in-staging 
b/src/config/torrc.minimal.in-staging
index ff324a9..248cb5c 100644
--- a/src/config/torrc.minimal.in-staging
+++ b/src/config/torrc.minimal.in-staging
@@ -12,20 +12,20 @@
 ## Tor will look for this file in various places based on your platform:
 ## https://www.torproject.org/docs/faq#torrc
 
-## Tor opens a socks proxy on port 9050 by default -- even if you don't
-## configure one below. Set "SocksPort 0" if you plan to run Tor only
+## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't
+## configure one below. Set "SOCKSPort 0" if you plan to run Tor only
 ## as a relay, and not make any local application connections yourself.
-#SocksPort 9050 # Default: Bind to localhost:9050 for local connections.
-#SocksPort 192.168.0.1:9100 # Bind to this address:port too.
+#SOCKSPort 9050 # Default: Bind to localhost:9050 for local connections.
+#SOCKSPort 192.168.0.1:9100 # Bind to this address:port too.
 
 ## Entry policies to allow/deny SOCKS requests based on IP address.
-## First entry that matches wins. If no SocksPolicy is set, we accept
-## all (and only) requests that reach a SocksPort. Untrusted users who
-## can access your SocksPort may be able to learn about the connections
+## First entry that matches wins. If no SOCKSPolicy is set, we accept
+## all (and only) requests that reach a SOCKSPort. Untrusted users who
+## can access your SOCKSPort may be able to learn about the connections
 ## you make.
-#SocksPolicy accept 192.168.0.0/16
-#SocksPolicy accept6 FC00::/7
-#SocksPolicy reject *
+#SOCKSPolicy accept 192.168.0.0/16
+#SOCKSPolicy accept6 FC00::/7
+#SOCKSPolicy reject *
 
 ## Logs go to stdout at level "notice" unless redirected by something
 ## else, like one of the below lines. You can have as many Log lines as
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index ff324a9..248cb5c 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -12,20 +12,20 @@
 ## Tor will look for this file in various places based on your platform:
 ## https://www.torproject.org/docs/faq#torrc
 
-## Tor opens a socks proxy on port 9050 by default -- even if you don't
-## configure one below. Set "SocksPort 0" if you plan to run Tor only
+## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't
+## configure one below. Set "SOCKSPort 0" if you plan to run Tor only
 ## as a relay, and not make any local application connections yourself.
-#SocksPort 9050 # Default: Bind to localhost:9050 for local connections.
-#SocksPort 192.168.0.1:9100 # Bind to this address:port too.
+#SOCKSPort 9050 # Default: Bind to localhost:9050 for local connections.
+#SOCKSPort 192.168.0.1:9100 # Bind to this address:port too.
 
 ## Entry policies to allow/deny SOCKS requests based on IP address.
-## First entry that matches wins. If no SocksPolicy is set, we accept
-## all (and only) requests that reach a SocksPort. Untrusted users who
-## can access your SocksPort may be able to learn about the connections
+## First entry that matches wins. If no SOCKSPolicy is set, we accept
+## all (and only) requests that reach a SOCKSPort. Untrusted users who
+## can access your SOCKSPort may be able to learn about the connections
 ## you make.
-#SocksPolicy accept 192.168.0.0/16
-#SocksPolicy accept6 FC00::/7
-#SocksPolicy reject *
+#SOCKSPolicy accept 192.168.0.0/16
+#SOCKSPolicy accept6 FC00::/7
+#SOCKSPolicy reject *
 
 ## Logs go to stdout at level "notice" unless redirected by something
 ## else, like one of the below lines. You can have as many Log lines as

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

[tor-commits] [tor-messenger-build/master] Update Instantbird config to remove obsolete patches

2015-09-29 Thread sukhbir

commit 4efe9f7c8e76e8dd37823dc166020d08df2bb4c8
Author: Sukhbir Singh 
Date:   Tue Sep 29 03:20:55 2015 -0400

Update Instantbird config to remove obsolete patches
---
 projects/instantbird/config |6 --
 1 file changed, 6 deletions(-)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index fdae23e..bd8b89c 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -111,14 +111,8 @@ input_files:
 enable: '[% c("var/osx") %]'
   - filename: fix-mingw-build.patch
 enable: '[% c("var/windows") %]'
-  - filename: f2e7cea9bc6a-bug-1150967.patch
-enable: '[% c("var/windows") %]'
   - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch
   - filename: block-plugins.mozpatch
-  - filename: 824009fbc42f.mozpatch
-enable: '[% c("var/windows") %]'
-  - filename: Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch
-enable: '[% c("var/windows") %]'
   - filename: OSX-package-as-tar.bz2.mozpatch
 enable: '[% c("var/osx") %]'
   - filename: Bug-1151345-Firefox-app-menu-sometimes-contains-only.mozpatch

___
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.7] No spaces around = in variable assignment

2015-09-29 Thread nickm

commit f75325c132847883a7ddc5f0f6e55847edc68507
Author: Marcin CieÅlak 
Date:   Fri Sep 25 14:16:40 2015 +

No spaces around = in variable assignment

BSD make takes spaces around = literally
and produces a "TESTING_TOR_BINARY "
variable with a trailing space, which leads
to test_keygen.sh failure.

Fixes 17154
---
 src/or/include.am |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/include.am b/src/or/include.am
index 7b12b56..d0e955f 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -123,9 +123,9 @@ src_or_tor_cov_LDADD = src/or/libtor-testing.a 
src/common/libor-testing.a \
src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
@TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@
-export TESTING_TOR_BINARY = $(top_builddir)/src/or/tor-cov
+export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov
 else
-export TESTING_TOR_BINARY = $(top_builddir)/src/or/tor
+export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor
 endif
 
 ORHEADERS = \



___
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.7] Changes file for bug17154

2015-09-29 Thread nickm

commit 216a9f7aecb19d717bed20557c2fd7d39333dba0
Author: Nick Mathewson 
Date:   Tue Sep 29 10:10:52 2015 +0200

Changes file for bug17154
---
 changes/bug17154 |3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug17154 b/changes/bug17154
new file mode 100644
index 000..6ad7b74
--- /dev/null
+++ b/changes/bug17154
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing):
+- Fix breakage when running 'make check' with BSD make. Fixes bug
+  17154; bugfix on 0.2.7.3-rc. Patch by Marcin CieÅlak.

___
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.7] go back in time to fix a changelog entry. Fix for 17165

2015-09-29 Thread nickm

commit c1981955ffe1d504b920ad1a1d10b83057d35660
Author: Nick Mathewson 
Date:   Tue Sep 29 10:21:52 2015 +0200

go back in time to fix a changelog entry. Fix for 17165
---
 ChangeLog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 25c7442..0191717 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,7 +61,7 @@ Changes in version 0.2.7.3-rc - 2015-09-25
   Fixes bug 16685; bugfix on 0.2.7.2-alpha. Reported by "s7r".
 
   o Minor features (client-side privacy):
-- New KeyAliveSOCKSAuth option to indefinitely extend circuit
+- New KeyepAliveIsolateSOCKSAuth option to indefinitely extend circuit
   lifespan when IsolateSOCKSAuth and streams with SOCKS
   authentication are attached to the circuit. This allows
   applications like TorBrowser to manage circuit lifetime on their

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

[tor-commits] [tor/master] No spaces around = in variable assignment

2015-09-29 Thread nickm

commit f75325c132847883a7ddc5f0f6e55847edc68507
Author: Marcin CieÅlak 
Date:   Fri Sep 25 14:16:40 2015 +

No spaces around = in variable assignment

BSD make takes spaces around = literally
and produces a "TESTING_TOR_BINARY "
variable with a trailing space, which leads
to test_keygen.sh failure.

Fixes 17154
---
 src/or/include.am |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/include.am b/src/or/include.am
index 7b12b56..d0e955f 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -123,9 +123,9 @@ src_or_tor_cov_LDADD = src/or/libtor-testing.a 
src/common/libor-testing.a \
src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
@TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@
-export TESTING_TOR_BINARY = $(top_builddir)/src/or/tor-cov
+export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov
 else
-export TESTING_TOR_BINARY = $(top_builddir)/src/or/tor
+export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor
 endif
 
 ORHEADERS = \



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

[tor-commits] [tor/master] Changes file for bug17154

2015-09-29 Thread nickm

commit 216a9f7aecb19d717bed20557c2fd7d39333dba0
Author: Nick Mathewson 
Date:   Tue Sep 29 10:10:52 2015 +0200

Changes file for bug17154
---
 changes/bug17154 |3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug17154 b/changes/bug17154
new file mode 100644
index 000..6ad7b74
--- /dev/null
+++ b/changes/bug17154
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing):
+- Fix breakage when running 'make check' with BSD make. Fixes bug
+  17154; bugfix on 0.2.7.3-rc. Patch by Marcin CieÅlak.



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

[tor-commits] [tor/master] Skip tests if backtrace support not compiled-in

2015-09-29 Thread nickm

commit 5c95762ec6c8e43fe7bc5582fd43585076214ba4
Author: Marcin CieÅlak 
Date:   Thu Sep 24 22:32:51 2015 +

Skip tests if backtrace support not compiled-in

FreeBSD needs -lexecinfo to fully support
backtrace reporting.
---
 src/test/test_bt.sh   |1 +
 src/test/test_bt_cl.c |   11 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/test/test_bt.sh b/src/test/test_bt.sh
index 56e6cc4..f55f451 100755
--- a/src/test/test_bt.sh
+++ b/src/test/test_bt.sh
@@ -3,6 +3,7 @@
 
 exitcode=0
 
+"${builddir:-.}/src/test/test-bt-cl" backtraces || exit 77
 "${builddir:-.}/src/test/test-bt-cl" assert | "${PYTHON:-python}" 
"${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode=1
 "${builddir:-.}/src/test/test-bt-cl" crash  | "${PYTHON:-python}" 
"${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode=1
 
diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c
index 01c621e..dabaee6 100644
--- a/src/test/test_bt_cl.c
+++ b/src/test/test_bt_cl.c
@@ -84,15 +84,24 @@ main(int argc, char **argv)
 
   if (argc < 2) {
 puts("I take an argument. It should be \"assert\" or \"crash\" or "
- "\"none\"");
+ "\"backtraces\" or \"none\"");
 return 1;
   }
+
+#if !(defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \
+   defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION))
+puts("Backtrace reporting is not supported on this platform");
+return 77;
+#endif
+
   if (!strcmp(argv[1], "assert")) {
 crashtype = 1;
   } else if (!strcmp(argv[1], "crash")) {
 crashtype = 0;
   } else if (!strcmp(argv[1], "none")) {
 crashtype = -1;
+  } else if (!strcmp(argv[1], "backtraces")) {
+return 0;
   } else {
 puts("Argument should be \"assert\" or \"crash\" or \"none\"");
 return 1;



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

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

2015-09-29 Thread nickm

commit 3d8a045bd6b9395c108cfbdfd971690163ca0e21
Merge: 551dba3 216a9f7
Author: Nick Mathewson 
Date:   Tue Sep 29 10:12:05 2015 +0200

Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug17151  |7 +++
 changes/bug17154  |3 +++
 configure.ac  |1 +
 src/or/include.am |4 ++--
 src/test/test_bt.sh   |1 +
 src/test/test_bt_cl.c |   11 ++-
 6 files changed, 24 insertions(+), 3 deletions(-)

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

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

2015-09-29 Thread nickm

commit 8e93cfb47f218dc7f431cfa820a5228b509d142c
Merge: 3d8a045 7fa102b
Author: Nick Mathewson 
Date:   Tue Sep 29 10:18:09 2015 +0200

Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug17173-socket-hack-rv |   10 +
 src/common/address.c|   27 +++
 src/common/address.h|8 ++--
 src/test/test_address.c |   95 +++
 4 files changed, 127 insertions(+), 13 deletions(-)

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

[tor-commits] [tor/master] get_interface_address6_list(): Bring back a return code check

2015-09-29 Thread nickm

commit 3ea834ce0a63f275fd806f9ebeec64a2bbcd1b55
Author: Fabian Keil 
Date:   Mon Sep 28 16:57:07 2015 +0200

get_interface_address6_list(): Bring back a return code check

... that was removed by 31eb486c46 which first appeared in
0.2.7.3-rc.

If tor is running in a ElectroBSD (or FreeBSD) jail it can't
get any IP addresses that aren't assigned to the jail by
looking at the interfaces and (by design) the
get_interface_address6_via_udp_socket_hack() fallback doesn't
work either.

The missing return code check resulted in tor_addr_is_internal()
complaining about a "non-IP address of type 49", due to reading
uninitialised memory.

Fixes #17173.
---
 src/common/address.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/address.c b/src/common/address.c
index 163db59..fc85f8e 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -1711,7 +1711,8 @@ MOCK_IMPL(smartlist_t *,get_interface_address6_list,(int 
severity,
   }
 
   /* Okay, the smart way is out. */
-  get_interface_address6_via_udp_socket_hack(severity,family,);
+  if (get_interface_address6_via_udp_socket_hack(severity,family,))
+ return smartlist_new();
   if (!include_internal && tor_addr_is_internal(, 0)) {
 return smartlist_new();
   } else {



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

[tor-commits] [tor/master] Add checks and unit tests for get_interface_address* failure

2015-09-29 Thread nickm

commit 7fa102b48783b51673095e1ddcb2f88050a2ba32
Author: teor (Tim Wilson-Brown) 
Date:   Tue Sep 29 07:04:49 2015 +0200

Add checks and unit tests for get_interface_address* failure

Ensure that either a valid address is returned in address pointers,
or that the address data is zeroed on error.

Ensure that free_interface_address6_list handles NULL lists.

Add unit tests for get_interface_address* failure cases.

Fixes bug #17173.
Patch by fk/teor, not in any released version of tor.
---
 changes/bug17173-socket-hack-rv |   10 +
 src/common/address.c|   24 ++
 src/common/address.h|8 ++--
 src/test/test_address.c |   95 +++
 4 files changed, 125 insertions(+), 12 deletions(-)

diff --git a/changes/bug17173-socket-hack-rv b/changes/bug17173-socket-hack-rv
new file mode 100644
index 000..c9f30d3
--- /dev/null
+++ b/changes/bug17173-socket-hack-rv
@@ -0,0 +1,10 @@
+  o Minor bug fixes (addresses, testing):
+- Handle errors in get_interface_address6_via_udp_socket_hack by
+  returning an empty list (no addresses found). This bug was triggered
+  in ElectroBSD/FreeBSD jails.
+- Ensure that either a valid address is returned in address pointers,
+  or that the address data is zeroed on error.
+- Ensure that free_interface_address6_list handles NULL lists.
+- Add unit tests for get_interface_address* failure cases.
+  Fixes bug #17173.
+  Patch by fk/teor, not in any released version of tor.
diff --git a/src/common/address.c b/src/common/address.c
index fc85f8e..cfa8fd1 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -1506,8 +1506,8 @@ get_interface_addresses_ioctl(int severity)
  * Return a new smartlist of tor_addr_t on success, and NULL on failure.
  * (An empty smartlist indicates that we successfully learned that we have no
  * addresses.)  Log failure messages at severity. */
-STATIC smartlist_t *
-get_interface_addresses_raw(int severity)
+MOCK_IMPL(smartlist_t *,
+get_interface_addresses_raw,(int severity))
 {
   smartlist_t *result = NULL;
 #if defined(HAVE_IFADDRS_TO_SMARTLIST)
@@ -1547,10 +1547,10 @@ tor_addr_is_multicast(const tor_addr_t *a)
  * UDP socket trickery. Only look for address of given family.
  * Set result to *addr. Return 0 on success, -1 on failure.
  */
-STATIC int
-get_interface_address6_via_udp_socket_hack(int severity,
-   sa_family_t family,
-   tor_addr_t *addr)
+MOCK_IMPL(int,
+get_interface_address6_via_udp_socket_hack,(int severity,
+sa_family_t family,
+tor_addr_t *addr))
 {
   struct sockaddr_storage my_addr, target_addr;
   int sock=-1, r=-1;
@@ -1614,6 +1614,8 @@ get_interface_address6_via_udp_socket_hack(int severity,
  err:
   if (sock >= 0)
 tor_close_socket(sock);
+  if (r == -1)
+memset(addr, 0, sizeof(tor_addr_t));
   return r;
 }
 
@@ -1632,6 +1634,8 @@ get_interface_address6,(int severity, sa_family_t family, 
tor_addr_t *addr))
   int rv = -1;
   tor_assert(addr);
 
+  memset(addr, 0, sizeof(tor_addr_t));
+
   /* Get a list of public or internal IPs in arbitrary order */
   addrs = get_interface_address6_list(severity, family, 1);
 
@@ -1656,8 +1660,10 @@ get_interface_address6,(int severity, sa_family_t 
family, tor_addr_t *addr))
 void
 free_interface_address6_list(smartlist_t *addrs)
 {
-  SMARTLIST_FOREACH(addrs, tor_addr_t *, a, tor_free(a));
-  smartlist_free(addrs);
+  if (addrs != NULL) {
+SMARTLIST_FOREACH(addrs, tor_addr_t *, a, tor_free(a));
+smartlist_free(addrs);
+  }
 }
 
 /** Return a smartlist of the IP addresses of type family from all interfaces
@@ -1975,6 +1981,8 @@ get_interface_address,(int severity, uint32_t *addr))
   tor_addr_t local_addr;
   int r;
 
+  memset(addr, 0, sizeof(uint32_t));
+
   r = get_interface_address6(severity, AF_INET, _addr);
   if (r>=0)
 *addr = tor_addr_to_ipv4h(_addr);
diff --git a/src/common/address.h b/src/common/address.h
index 7d49fb5..d2841e1 100644
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -310,11 +310,11 @@ get_interface_address_list(int severity, int 
include_internal)
 tor_addr_port_t *tor_addr_port_new(const tor_addr_t *addr, uint16_t port);
 
 #ifdef ADDRESS_PRIVATE
-STATIC smartlist_t *get_interface_addresses_raw(int severity);
+MOCK_DECL(smartlist_t *,get_interface_addresses_raw,(int severity));
 STATIC int tor_addr_is_multicast(const tor_addr_t *a);
-STATIC int get_interface_address6_via_udp_socket_hack(int severity,
-  sa_family_t family,
-  tor_addr_t *addr);
+MOCK_DECL(int,get_interface_address6_via_udp_socket_hack,(int severity,
+  sa_family_t

[tor-commits] [tor-messenger-build/master] Update mingw-w64 version

2015-09-29 Thread boklm

commit d0e75f714cf86a9147feb9ac4f35e99c6c370e5f
Author: Nicolas Vigier 
Date:   Tue Sep 29 15:11:16 2015 +0200

Update mingw-w64 version
---
 projects/mingw-w64/config |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config
index 20c76ef..5817f74 100644
--- a/projects/mingw-w64/config
+++ b/projects/mingw-w64/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64
-git_hash: 85b403445b2308fa6277aa26446da790866fe052
+git_hash: 548b1984042a1dd66cae95ad8c0003b5e5494a68
 version: '[% c("abbrev") %]'
 remote_docker: 1
 lsb_release:

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

[tor-commits] [tor-messenger-build/master] Add libotr patch for bug.otr.im/issues/72

2015-09-29 Thread arlo

commit c59d2b146a0ea8427b1e7f62ab073c64a787eeba
Author: Arlo Breault 
Date:   Tue Sep 29 14:42:53 2015 +0200

Add libotr patch for bug.otr.im/issues/72
---
 projects/libotr/bugs-otr-im-72.patch |   60 ++
 projects/libotr/build|1 +
 projects/libotr/config   |1 +
 3 files changed, 62 insertions(+)

diff --git a/projects/libotr/bugs-otr-im-72.patch 
b/projects/libotr/bugs-otr-im-72.patch
new file mode 100644
index 000..a56dda3
--- /dev/null
+++ b/projects/libotr/bugs-otr-im-72.patch
@@ -0,0 +1,60 @@
+From f466e0c698d022cbd6ddb279e1ca4c84a0703b3b Mon Sep 17 00:00:00 2001
+From: David Goulet 
+Date: Tue, 18 Aug 2015 09:32:19 +0200
+Subject: [PATCH] Fix: set to NULL the sendsmp pointer when handling SMP
+
+Also, for extra precaution, set the message pointer in
+otrl_proto_create_data() to NULL at the beginning.
+
+Fixes #72
+
+Signed-off-by: David Goulet 
+---
+ src/message.c | 4 ++--
+ src/proto.c   | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/message.c b/src/message.c
+index f17e5e1..9572fc9 100644
+--- a/src/message.c
 b/src/message.c
+@@ -1502,7 +1502,7 @@ int otrl_message_receiving(OtrlUserState us, const 
OtrlMessageAppOps *ops,
+   unsigned char* nextmsg;
+   int nextmsglen;
+   OtrlTLV *sendtlv;
+-  char *sendsmp;
++  char *sendsmp = NULL;
+   otrl_sm_step3(context->smstate, tlv->data,
+   tlv->len, , );
+ 
+@@ -1557,7 +1557,7 @@ int otrl_message_receiving(OtrlUserState us, const 
OtrlMessageAppOps *ops,
+   unsigned char* nextmsg;
+   int nextmsglen;
+   OtrlTLV *sendtlv;
+-  char *sendsmp;
++  char *sendsmp = NULL;
+   err = otrl_sm_step4(context->smstate, tlv->data,
+   tlv->len, , );
+   /* Set trust level based on result */
+diff --git a/src/proto.c b/src/proto.c
+index f560a82..a8813ab 100644
+--- a/src/proto.c
 b/src/proto.c
+@@ -497,6 +497,8 @@ gcry_error_t otrl_proto_create_data(char **encmessagep, 
ConnContext *context,
+ char *msgdup;
+ int version = context->protocol_version;
+ 
++  *encmessagep = NULL;
++
+ /* Make sure we're actually supposed to be able to encrypt */
+ if (context->msgstate != OTRL_MSGSTATE_ENCRYPTED ||
+   context->context_priv->their_keyid == 0) {
+@@ -511,8 +513,6 @@ gcry_error_t otrl_proto_create_data(char **encmessagep, 
ConnContext *context,
+ }
+ strcpy(msgdup, msg);
+ 
+-*encmessagep = NULL;
+-
+ /* Header, msg flags, send keyid, recv keyid, counter, msg len, msg
+  * len of revealed mac keys, revealed mac keys, MAC */
+ buflen = OTRL_HEADER_LEN + (version == 3 ? 8 : 0)
diff --git a/projects/libotr/build b/projects/libotr/build
old mode 100644
new mode 100755
index c0753d6..ecd94ee
--- a/projects/libotr/build
+++ b/projects/libotr/build
@@ -12,6 +12,7 @@ cd $rootdir
 distdir=/var/tmp/dist/[% project %]
 tar xf libotr-[% c('version') %].tar.gz
 cd libotr-[% c('version') %]
+patch -p1 < ../bugs-otr-im-72.patch
 ./configure --prefix=$distdir [% c("var/configure_opt") %]
 make -j4 [% IF c("var/windows") %]LDFLAGS='-no-undefined -lssp'[% END %]
 make prefix=$distdir install
diff --git a/projects/libotr/config b/projects/libotr/config
index 8ca4a78..73081c7 100644
--- a/projects/libotr/config
+++ b/projects/libotr/config
@@ -38,6 +38,7 @@ input_files:
 file_gpg_id: 1
 sig_ext: asc
 gpg_keyring: libotr.gpg
+  - filename: bugs-otr-im-72.patch
   - project: libgcrypt
 name: libgcrypt
   - project: libgpg-error

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

[tor-commits] [tor-messenger-build/master] Ifdef performance_toolkit.xpt

2015-09-29 Thread arlo

commit e50a4c667cec1dadb18cf73f89d33343f17a8257
Author: Arlo Breault 
Date:   Tue Sep 29 15:17:55 2015 +0200

Ifdef performance_toolkit.xpt

 * https://bugzilla.mozilla.org/show_bug.cgi?id=1209505
---
 projects/instantbird/config|1 +
 .../ifdef-performance-toolkit-xpt.patch|   31 
 2 files changed, 32 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index bd8b89c..ba71fa9 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -86,6 +86,7 @@ input_files:
   - filename: search-context-menu.patch
   - filename: search-preferences-xul.patch
   - filename: log-preferences-xul.patch
+  - filename: ifdef-performance-toolkit-xpt.patch
   - filename: branding/blistWindow.png
   - filename: branding/blistWindow16.png
   - filename: branding/blistWindow48.png
diff --git a/projects/instantbird/ifdef-performance-toolkit-xpt.patch 
b/projects/instantbird/ifdef-performance-toolkit-xpt.patch
new file mode 100644
index 000..863f9b7
--- /dev/null
+++ b/projects/instantbird/ifdef-performance-toolkit-xpt.patch
@@ -0,0 +1,31 @@
+# HG changeset patch
+# User Arlo Breault 
+# Date 1443532131 -7200
+#  Tue Sep 29 15:08:51 2015 +0200
+# Node ID 3c43eb71066949342af540518d3051565de9cb8a
+# Parent  e1a209673d05dc27dd5a8230b257b1ddcc1cb055
+Port bug 1164707 to /im
+
+diff --git a/im/installer/package-manifest.in 
b/im/installer/package-manifest.in
+--- a/im/installer/package-manifest.in
 b/im/installer/package-manifest.in
+@@ -422,17 +422,19 @@
+ #ifdef MOZ_WEBRTC
+ @RESPATH@/components/PeerConnection.js
+ @RESPATH@/components/PeerConnection.manifest
+ #endif
+ @RESPATH@/components/toolkit_asyncshutdown.xpt
+ @RESPATH@/components/toolkit_filewatcher.xpt
+ @RESPATH@/components/toolkit_formautofill.xpt
+ @RESPATH@/components/toolkit_osfile.xpt
++#ifdef NIGHTLY_BUILD
+ @RESPATH@/components/toolkit_perfmonitoring.xpt
++#endif
+ @RESPATH@/components/toolkit_xulstore.xpt
+ @RESPATH@/components/toolkitplaces.manifest
+ @RESPATH@/components/toolkitsearch.manifest
+ #ifdef UNIX_BUT_NOT_MAC
+ @RESPATH@/components/toolkitremote.xpt
+ #endif
+ #ifdef MOZ_GTK
+ @RESPATH@/components/filepicker.xpt

___
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.7] Fix past changelog spelling again!

2015-09-29 Thread nickm

commit 22a912755faba6ef1315f701b358b005906a3100
Author: Nick Mathewson 
Date:   Tue Sep 29 12:49:23 2015 +0200

Fix past changelog spelling again!
---
 ChangeLog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0191717..46005a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,7 +61,7 @@ Changes in version 0.2.7.3-rc - 2015-09-25
   Fixes bug 16685; bugfix on 0.2.7.2-alpha. Reported by "s7r".
 
   o Minor features (client-side privacy):
-- New KeyepAliveIsolateSOCKSAuth option to indefinitely extend circuit
+- New KeepAliveIsolateSOCKSAuth option to indefinitely extend circuit
   lifespan when IsolateSOCKSAuth and streams with SOCKS
   authentication are attached to the circuit. This allows
   applications like TorBrowser to manage circuit lifetime on their

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

[tor-commits] [tor/master] Fix past changelog spelling again!

2015-09-29 Thread nickm

commit 22a912755faba6ef1315f701b358b005906a3100
Author: Nick Mathewson 
Date:   Tue Sep 29 12:49:23 2015 +0200

Fix past changelog spelling again!
---
 ChangeLog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0191717..46005a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,7 +61,7 @@ Changes in version 0.2.7.3-rc - 2015-09-25
   Fixes bug 16685; bugfix on 0.2.7.2-alpha. Reported by "s7r".
 
   o Minor features (client-side privacy):
-- New KeyepAliveIsolateSOCKSAuth option to indefinitely extend circuit
+- New KeepAliveIsolateSOCKSAuth option to indefinitely extend circuit
   lifespan when IsolateSOCKSAuth and streams with SOCKS
   authentication are attached to the circuit. This allows
   applications like TorBrowser to manage circuit lifetime on their



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

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

2015-09-29 Thread nickm

commit aaf748435cb6e42922bf5948b04b4679bbf649b1
Merge: efff55b 22a9127
Author: Nick Mathewson 
Date:   Tue Sep 29 12:49:59 2015 +0200

Merge remote-tracking branch 'origin/maint-0.2.7'

 ChangeLog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [tor/master] Add a README for the trunnel directory

2015-09-29 Thread nickm

commit 62d6a8ef4db8b720bfb2786775fdf617dc8351be
Author: Nick Mathewson 
Date:   Tue Sep 29 13:43:12 2015 +0200

Add a README for the trunnel directory
---
 src/trunnel/README |   10 ++
 src/trunnel/include.am |4 
 2 files changed, 14 insertions(+)

diff --git a/src/trunnel/README b/src/trunnel/README
new file mode 100644
index 000..383272c
--- /dev/null
+++ b/src/trunnel/README
@@ -0,0 +1,10 @@
+This directory contains code for use with, and code made by, the
+automatic code generation tool "Trunnel".
+
+The .trunnel files are the inputs here; the .c and .h files are the outputs.
+To regenerate the .c and .h files, run "scripts/codegen/run_trunnel.sh".
+
+For the Trunnel source code, and more documentation about using Trunnel,
+see https://gitweb.torproject.org/trunnel.git , especially
+https://gitweb.torproject.org/trunnel.git/tree/README
+and https://gitweb.torproject.org/trunnel.git/tree/doc/trunnel.md
diff --git a/src/trunnel/include.am b/src/trunnel/include.am
index 9bf37fe..b1448b7 100644
--- a/src/trunnel/include.am
+++ b/src/trunnel/include.am
@@ -36,3 +36,7 @@ src_trunnel_libor_trunnel_testing_a_CPPFLAGS = 
-DTRUNNEL_LOCAL_H $(AM_CPPFLAGS)
 src_trunnel_libor_trunnel_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
 noinst_HEADERS+= $(TRUNNELHEADERS)
+
+EXTRA_DIST += \
+   src/trunnel/README
+



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

[tor-commits] [tor/master] fix compilation; mark test fns static

2015-09-29 Thread nickm

commit d4212d581ae418dcb91eac6343359bb7deb90c0a
Author: Nick Mathewson 
Date:   Tue Sep 29 13:50:52 2015 +0200

fix compilation; mark test fns static
---
 src/test/test_address.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/test_address.c b/src/test/test_address.c
index b442f4a..938f776 100644
--- a/src/test/test_address.c
+++ b/src/test/test_address.c
@@ -781,7 +781,7 @@ test_address_get_if_addrs6_list_no_internal(void *arg)
 
 static int called_get_interface_addresses_raw = 0;
 
-smartlist_t *
+static smartlist_t *
 mock_get_interface_addresses_raw_fail(int severity)
 {
   (void)severity;
@@ -792,7 +792,7 @@ mock_get_interface_addresses_raw_fail(int severity)
 
 static int called_get_interface_address6_via_udp_socket_hack = 0;
 
-int
+static int
 mock_get_interface_address6_via_udp_socket_hack_fail(int severity,
  sa_family_t family,
  tor_addr_t *addr)



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

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

2015-09-29 Thread nickm

commit 003462432b1ddcd938031fb7f2f7a403125b0ccb
Merge: 62d6a8e d4212d5
Author: Nick Mathewson 
Date:   Tue Sep 29 13:51:08 2015 +0200

Merge remote-tracking branch 'origin/maint-0.2.7'

 src/test/test_address.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

___
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.7] fix compilation; mark test fns static

2015-09-29 Thread nickm

commit d4212d581ae418dcb91eac6343359bb7deb90c0a
Author: Nick Mathewson 
Date:   Tue Sep 29 13:50:52 2015 +0200

fix compilation; mark test fns static
---
 src/test/test_address.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/test_address.c b/src/test/test_address.c
index b442f4a..938f776 100644
--- a/src/test/test_address.c
+++ b/src/test/test_address.c
@@ -781,7 +781,7 @@ test_address_get_if_addrs6_list_no_internal(void *arg)
 
 static int called_get_interface_addresses_raw = 0;
 
-smartlist_t *
+static smartlist_t *
 mock_get_interface_addresses_raw_fail(int severity)
 {
   (void)severity;
@@ -792,7 +792,7 @@ mock_get_interface_addresses_raw_fail(int severity)
 
 static int called_get_interface_address6_via_udp_socket_hack = 0;
 
-int
+static int
 mock_get_interface_address6_via_udp_socket_hack_fail(int severity,
  sa_family_t family,
  tor_addr_t *addr)

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

[tor-commits] [tor-messenger-build/master] Revert changes from mozilla bug 1170522

2015-09-29 Thread boklm

commit fc2dc51c5fd378c3494222853a0800a427e86e82
Author: Nicolas Vigier 
Date:   Tue Sep 29 16:09:33 2015 +0200

Revert changes from mozilla bug 1170522
---
 ...fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch |   24 +
 ...0522-expose-whether-or-not-we-re-in-ta.mozpatch |  512 
 projects/instantbird/config|4 +
 3 files changed, 540 insertions(+)

diff --git 
a/projects/instantbird/0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch
 
b/projects/instantbird/0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch
new file mode 100644
index 000..344e2ed
--- /dev/null
+++ 
b/projects/instantbird/0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch
@@ -0,0 +1,24 @@
+From 464da9c6d7b576a9b92b2c2e26d52a9213e3f89d Mon Sep 17 00:00:00 2001
+From: Nicolas Vigier 
+Date: Tue, 29 Sep 2015 16:06:38 +0200
+Subject: [PATCH 1/2] Revert "no bug - fix case of nsIDocShell.h in
+ WindowsUIUtils.cpp"
+
+This reverts commit 02335958d9315e5620f030617e4a599209697054.
+---
+ widget/windows/WindowsUIUtils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/widget/windows/WindowsUIUtils.cpp 
b/widget/windows/WindowsUIUtils.cpp
+index 0c93d945cf30..98325f0eb055 100644
+--- a/widget/windows/WindowsUIUtils.cpp
 b/widget/windows/WindowsUIUtils.cpp
+@@ -11,7 +11,7 @@
+ 
+ #include "nsIObserverService.h"
+ #include "nsIBaseWindow.h"
+-#include "nsIDocShell.h"
++#include "nsIDocshell.h"
+ #include "nsIAppShellService.h"
+ #include "nsAppShellCID.h"
+ #include "nsIXULWindow.h"
diff --git 
a/projects/instantbird/0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch
 
b/projects/instantbird/0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch
new file mode 100644
index 000..bf68c7c
--- /dev/null
+++ 
b/projects/instantbird/0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch
@@ -0,0 +1,512 @@
+From 0fd6ae4f5947b5229b8c14704b893d95787e54a3 Mon Sep 17 00:00:00 2001
+From: Nicolas Vigier 
+Date: Tue, 29 Sep 2015 16:06:49 +0200
+Subject: [PATCH 2/2] Revert "Bug 1170522 - expose whether or not we're in
+ tablet mode to xul/js/css, r=jimm,ted"
+
+This reverts commit 6c7bdf65167060865d9f9a09c0aa3dae0d91680c.
+---
+ build/win32/mozconfig.vs2013-win64 |   2 +-
+ build/win64/mozconfig.vs2013   |   2 +-
+ toolkit/library/moz.build  |   6 --
+ widget/moz.build   |   1 -
+ widget/nsIWindowsUIUtils.idl   |  24 -
+ widget/nsWidgetsCID.h  |   4 -
+ widget/windows/WindowsUIUtils.cpp  | 174 -
+ widget/windows/WindowsUIUtils.h|  29 ---
+ widget/windows/moz.build   |   1 -
+ widget/windows/mozwrlbase.h|  77 
+ widget/windows/nsWidgetFactory.cpp |   6 --
+ widget/windows/nsWindow.cpp|  16 
+ 12 files changed, 2 insertions(+), 340 deletions(-)
+ delete mode 100644 widget/nsIWindowsUIUtils.idl
+ delete mode 100644 widget/windows/WindowsUIUtils.cpp
+ delete mode 100644 widget/windows/WindowsUIUtils.h
+ delete mode 100644 widget/windows/mozwrlbase.h
+
+diff --git a/build/win32/mozconfig.vs2013-win64 
b/build/win32/mozconfig.vs2013-win64
+index 85821f0720aa..86a846cf670e 100644
+--- a/build/win32/mozconfig.vs2013-win64
 b/build/win32/mozconfig.vs2013-win64
+@@ -2,7 +2,7 @@ _VSPATH="/c/tools/vs2013"
+ export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x86/Microsoft.VC120.CRT
+ 
+ ## includes: win8.1 sdk includes, msvc std library, directx sdk for d3d9 ##
+-export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ 
Kits/8.1/include/shared:/c/Program\ Files\ \(x86\)/Windows\ 
Kits/8.1/include/um:/c/Program\ Files\ \(x86\)/Windows\ 
Kits/8.1/include/winrt:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include
++export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ 
Kits/8.1/include/shared:/c/Program\ Files\ \(x86\)/Windows\ 
Kits/8.1/include/um:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include
+ 
+ ## libs: win8.1 sdk x86 (32-bit) libs, msvc (32-bit) std library, msvc atl 
libs, directx sdk (32-bit) for d3d9  ##
+ export LIBPATH=/c/Program\ Files\ \(x86\)/Windows\ 
Kits/8.1/Lib/winv6.3/um/x86:${_VSPATH}/vc/lib:${_VSPATH}/vc/atlmfc/lib:/c/tools/sdks/dx10/lib
+diff --git a/build/win64/mozconfig.vs2013 b/build/win64/mozconfig.vs2013
+index 5fbde2df738b..776c9183e522 100644
+--- a/build/win64/mozconfig.vs2013
 b/build/win64/mozconfig.vs2013
+@@ -2,7 +2,7 @@ _VSPATH="/c/tools/vs2013"
+ export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x64/Microsoft.VC120.CRT
+ 
+ ## includes: win8.1 sdk includes, msvc std library, directx sdk for d3d9 ##
+-export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ 
Kits/8.1/include/shared:/c/Program\ Files\ \(x86\)/Windows\ 
Kits/8.1/include/um:/c/Program\ Files\ \(x86\)/Windows\

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

2015-09-29 Thread translation

commit e58ef6679cd919cab084fc445147c7c551aea811
Author: Translation commit bot 
Date:   Tue Sep 29 21:15:16 2015 +

Update translations for whisperback_completed
---
 bg/bg.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bg/bg.po b/bg/bg.po
index 1129307..8d1ec90 100644
--- a/bg/bg.po
+++ b/bg/bg.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-03-17 17:40+0100\n"
-"PO-Revision-Date: 2015-08-12 14:55+\n"
+"PO-Revision-Date: 2015-09-29 21:08+\n"
 "Last-Translator: alexdimitrov \n"
 "Language-Team: Bulgarian 
(http://www.transifex.com/otf/torproject/language/bg/)\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/whisperback] Update translations for whisperback

2015-09-29 Thread translation

commit 1ff81443954596c821aa59a7f8ee4212d6ddd0a0
Author: Translation commit bot 
Date:   Tue Sep 29 21:15:11 2015 +

Update translations for whisperback
---
 bg/bg.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bg/bg.po b/bg/bg.po
index 1129307..8d1ec90 100644
--- a/bg/bg.po
+++ b/bg/bg.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-03-17 17:40+0100\n"
-"PO-Revision-Date: 2015-08-12 14:55+\n"
+"PO-Revision-Date: 2015-09-29 21:08+\n"
 "Last-Translator: alexdimitrov \n"
 "Language-Team: Bulgarian 
(http://www.transifex.com/otf/torproject/language/bg/)\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/bridgedb_completed] Update translations for bridgedb_completed

2015-09-29 Thread translation

commit 5061eda6940c79c0a7b481ca4ae1f19396e1e7db
Author: Translation commit bot 
Date:   Tue Sep 29 17:45:10 2015 +

Update translations for bridgedb_completed
---
 cs/LC_MESSAGES/bridgedb.po |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po
index 537d37f..3a4d8b6 100644
--- a/cs/LC_MESSAGES/bridgedb.po
+++ b/cs/LC_MESSAGES/bridgedb.po
@@ -6,6 +6,7 @@
 # A5h8d0wf0x , 2014
 # Adam Slovacek , 2013
 # Elisa , 2011
+# Filip Hruska , 2015
 # Sanky , 2011
 # JiÅÃ VÃrava , 2014
 # mxsedlacek, 2014
@@ -16,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'POT-Creation-Date:
 2015-03-19 22:13+\n"
-"PO-Revision-Date: 2015-07-03 20:57+\n"
-"Last-Translator: Vlastimil BuriÃ¡n \n"
-"Language-Team: Czech 
(http://www.transifex.com/projects/p/torproject/language/cs/)\n"
+"PO-Revision-Date: 2015-09-29 17:18+\n"
+"Last-Translator: Filip Hruska \n"
+"Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -211,7 +212,7 @@ msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Chcete-li zadat mosty do Tor Browser, jdÄte nejprve do %s Tor Browser 
strÃ¡nky\nke staÅ¾enÃ %s, a pak postupujte podle pokynÅ¯ pro staÅ¾enÃ a 
spuÅ¡tÄnÃ\nTor Browser."
+msgstr "K vloÅ¾enÃ mostÅ¯ do Tor Browser, postupujte podle instrukcÃ na %s 
Tor\nBrowser strÃ¡nce ke staÅ¾enÃ %s ke spuÅ¡tÄnÃ Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: lib/bridgedb/strings.py:126

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

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

2015-09-29 Thread translation

commit ed0c61a16c77399b579c7771a710dd47124f67aa
Author: Translation commit bot 
Date:   Tue Sep 29 17:45:03 2015 +

Update translations for bridgedb
---
 cs/LC_MESSAGES/bridgedb.po |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po
index 537d37f..3a4d8b6 100644
--- a/cs/LC_MESSAGES/bridgedb.po
+++ b/cs/LC_MESSAGES/bridgedb.po
@@ -6,6 +6,7 @@
 # A5h8d0wf0x , 2014
 # Adam Slovacek , 2013
 # Elisa , 2011
+# Filip Hruska , 2015
 # Sanky , 2011
 # JiÅÃ VÃrava , 2014
 # mxsedlacek, 2014
@@ -16,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'POT-Creation-Date:
 2015-03-19 22:13+\n"
-"PO-Revision-Date: 2015-07-03 20:57+\n"
-"Last-Translator: Vlastimil BuriÃ¡n \n"
-"Language-Team: Czech 
(http://www.transifex.com/projects/p/torproject/language/cs/)\n"
+"PO-Revision-Date: 2015-09-29 17:18+\n"
+"Last-Translator: Filip Hruska \n"
+"Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -211,7 +212,7 @@ msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Chcete-li zadat mosty do Tor Browser, jdÄte nejprve do %s Tor Browser 
strÃ¡nky\nke staÅ¾enÃ %s, a pak postupujte podle pokynÅ¯ pro staÅ¾enÃ a 
spuÅ¡tÄnÃ\nTor Browser."
+msgstr "K vloÅ¾enÃ mostÅ¯ do Tor Browser, postupujte podle instrukcÃ na %s 
Tor\nBrowser strÃ¡nce ke staÅ¾enÃ %s ke spuÅ¡tÄnÃ Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: lib/bridgedb/strings.py:126

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

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

2015-09-29 Thread translation

commit 5994dbea1630005e657929edcadfa253fa67e68c
Author: Translation commit bot 
Date:   Tue Sep 29 17:15:16 2015 +

Update translations for whisperback_completed
---
 es/es.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es/es.po b/es/es.po
index 78fad9c..2b0ca85 100644
--- a/es/es.po
+++ b/es/es.po
@@ -15,9 +15,9 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-03-17 17:40+0100\n"
-"PO-Revision-Date: 2015-06-16 12:20+\n"
+"PO-Revision-Date: 2015-09-29 17:02+\n"
 "Last-Translator: Carlos Javier \n"
-"Language-Team: Spanish 
(http://www.transifex.com/projects/p/torproject/language/es/)\n"
+"Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\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/whisperback] Update translations for whisperback

2015-09-29 Thread translation

commit a75e458c121b868749938a39d72b474e45a68739
Author: Translation commit bot 
Date:   Tue Sep 29 17:15:12 2015 +

Update translations for whisperback
---
 es/es.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es/es.po b/es/es.po
index 78fad9c..2b0ca85 100644
--- a/es/es.po
+++ b/es/es.po
@@ -15,9 +15,9 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-03-17 17:40+0100\n"
-"PO-Revision-Date: 2015-06-16 12:20+\n"
+"PO-Revision-Date: 2015-09-29 17:02+\n"
 "Last-Translator: Carlos Javier \n"
-"Language-Team: Spanish 
(http://www.transifex.com/projects/p/torproject/language/es/)\n"
+"Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\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/liveusb-creator_completed] Update translations for liveusb-creator_completed

2015-09-29 Thread translation

commit db5e7e344c136c488a6d167e2983a1b5a132b72d
Author: Translation commit bot 
Date:   Tue Sep 29 17:45:30 2015 +

Update translations for liveusb-creator_completed
---
 cs/cs.po |  215 +-
 1 file changed, 116 insertions(+), 99 deletions(-)

diff --git a/cs/cs.po b/cs/cs.po
index c3aeccb..7abd7b2 100644
--- a/cs/cs.po
+++ b/cs/cs.po
@@ -7,46 +7,55 @@
 # Adam PÅibyl , 2008
 # Adam Slovacek , 2013
 # Filip Hruska , 2013
+# Filip Hruska , 2015
 # FooBar , 2015
 # Jan SplÃchal , 2014
-# JiÅÃ VÃrava , 2014
+# JiÅÃ VÃrava , 2014-2015
 # dope , 2013
 # Radek Bensch , 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-11 19:14+0100\n"
-"PO-Revision-Date: 2015-02-14 09:01+\n"
-"Last-Translator: FooBar \n"
-"Language-Team: Czech 
(http://www.transifex.com/projects/p/torproject/language/cs/)\n"
+"POT-Creation-Date: 2015-08-10 16:01+0200\n"
+"PO-Revision-Date: 2015-09-29 17:22+\n"
+"Last-Translator: Filip Hruska \n"
+"Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: ../liveusb/gui.py:451
+msgid "\"Clone & Install\""
+msgstr "\"Klonovat a instalovat\""
+
+#: ../liveusb/gui.py:453
+msgid "\"Install from ISO\""
+msgstr "\"Instalovat z ISO\""
+
 #: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149
 #, python-format
 msgid "%(distribution)s Installer"
 msgstr "%(distribution)s instalÃ¡tor"
 
-#: ../liveusb/gui.py:775
+#: ../liveusb/gui.py:804
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s zvolen"
 
-#: ../liveusb/gui.py:425
+#: ../liveusb/gui.py:424
 #, python-format
 msgid "%(size)s %(label)s"
 msgstr "%(size)s %(label)s"
 
-#: ../liveusb/gui.py:431
+#: ../liveusb/gui.py:430
 #, python-format
 msgid "%(vendor)s %(model)s (%(details)s) - %(device)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../liveusb/creator.py:1063
+#: ../liveusb/creator.py:1097
 #, python-format
 msgid "%s already bootable"
 msgstr "%s je bootovatelnÃ©"
@@ -103,16 +112,16 @@ msgid ""
 "persist after a reboot."
 msgstr "VyÄlenÄnÃm speciÃ¡lnÃho mÃsta na USB disku pro trvalÃ© 
uloÅ¾iÅ¡tÄ, budete schopni uklÃ¡dat data a trvale upravovat VÃ¡Å¡ operaÄnÃ 
systÃ©m. Bez trvalÃ©ho uloÅ¾iÅ¡tÄ nenÃ moÅ¾nÃ© data uloÅ¾it pro dalÅ¡Ã start 
systÃ©mu."
 
-#: ../liveusb/creator.py:1162 ../liveusb/creator.py:1425
+#: ../liveusb/creator.py:1196 ../liveusb/creator.py:1459
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Kalkuluji SHA1 %s"
 
-#: ../liveusb/creator.py:1373
+#: ../liveusb/creator.py:1407
 msgid "Cannot find"
 msgstr "Nemohu nalÃ©zt"
 
-#: ../liveusb/creator.py:556
+#: ../liveusb/creator.py:560
 #, python-format
 msgid "Cannot find device %s"
 msgstr "Nemohu nalÃ©zt zaÅÃzenÃ %s"
@@ -131,12 +140,12 @@ msgid ""
 "Upgrade"
 msgstr "Klonovat\n&&\nUpgradovat"
 
-#: ../liveusb/creator.py:408
+#: ../liveusb/creator.py:417
 #, python-format
 msgid "Creating %sMB persistent overlay"
 msgstr "VytvÃ¡ÅÃm %sMB pÅekrytÃ trvalÃ©ho ÃºloÅ¾iÅ¡tÄ"
 
-#: ../liveusb/gui.py:553
+#: ../liveusb/gui.py:582
 msgid ""
 "Device is not yet mounted, so we cannot determine the amount of free space."
 msgstr "Disk jeÅ¡tÄ nebyl pÅipojen, proto nenÃ moÅ¾nÃ© urÄit mnoÅ¾stvÃ 
volnÃ©ho mÃsta."
@@ -146,58 +155,58 @@ msgstr "Disk jeÅ¡tÄ nebyl pÅipojen, proto nenÃ moÅ¾nÃ© 
urÄit mnoÅ¾stvÃ voln
 msgid "Download %(distribution)s"
 msgstr "StÃ¡hni %(distribution)s"
 
-#: ../liveusb/gui.py:749
+#: ../liveusb/gui.py:778
 msgid "Download complete!"
 msgstr "StahovÃ¡nÃ dokonÄeno!"
 
-#: ../liveusb/gui.py:753
+#: ../liveusb/gui.py:782
 msgid "Download failed: "
 msgstr "StahovÃ¡nÃ selhalo: "
 
-#: ../liveusb/gui.py:88
+#: ../liveusb/gui.py:89
 #, python-format
 msgid "Downloading %s..."
 msgstr "Stahuji %s..."
 
-#: ../liveusb/creator.py:1158
+#: ../liveusb/creator.py:1192
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "ZaÅÃzenÃ je smyÄka, pÅeskakuji resetovÃ¡nÃ hlavnÃho 
bootovacÃho zÃ¡znamu"
 
-#: ../liveusb/creator.py:827
+#: ../liveusb/creator.py:837
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "SpouÅ¡tÃ se unmount_device pro '%(device)s'"
 
-#: ../liveusb/creator.py:1238
+#: ../liveusb/creator.py:1272
 msgid "Error probing device"
 msgstr "Chyba pÅi snÃmÃ¡nÃ zaÅÃzenÃ"
 
-#: ../liveusb/gui.py:212
+#: ../liveusb/gui.py:213
 msgid ""
 "Error: Cannot set the label or obtain the UUID of your

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

2015-09-29 Thread translation

commit 82bd4f29eb9a580d1da8d5eef1393fd29a49bc53
Author: Translation commit bot 
Date:   Tue Sep 29 17:45:26 2015 +

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

diff --git a/cs/cs.po b/cs/cs.po
index 3f471a0..7abd7b2 100644
--- a/cs/cs.po
+++ b/cs/cs.po
@@ -7,6 +7,7 @@
 # Adam PÅibyl , 2008
 # Adam Slovacek , 2013
 # Filip Hruska , 2013
+# Filip Hruska , 2015
 # FooBar , 2015
 # Jan SplÃchal , 2014
 # JiÅÃ VÃrava , 2014-2015
@@ -17,8 +18,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-08-10 16:01+0200\n"
-"PO-Revision-Date: 2015-08-28 05:16+\n"
-"Last-Translator: JiÅÃ VÃrava \n"
+"PO-Revision-Date: 2015-09-29 17:22+\n"
+"Last-Translator: Filip Hruska \n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -242,7 +243,7 @@ msgid ""
 "It is impossible to upgrade the device %(pretty_name)s because it was not "
 "created using Tails Installer. You should instead use %(action)s to upgrade "
 "Tails on this device."
-msgstr ""
+msgstr "Je nemoÅ¾nÃ© upgradovat zaÅÃzenÃ %(pretty_name)s protoÅ¾e nebylo 
vytvoÅeno pomocÃ Tails instalÃ¡toru. PouÅ¾ijte %(action)s pro upgrade Tails 
na zaÅÃzenÃ."
 
 #: ../liveusb/gui.py:270
 msgid "LiveUSB creation failed!"
@@ -360,7 +361,7 @@ msgstr "CÃlovÃ© zaÅÃzenÃ"
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
 "%(size)s GB is required)."
-msgstr ""
+msgstr "ZaÅÃzenÃ \"%(pretty_name)s\" je moc malÃ© pro instalaci Tails (je 
vyÅ¾adovÃ¡no alespoÅ %(size)s GB)."
 
 #: ../liveusb/gui.py:792
 msgid ""

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

41 matches

Mail list logo