date:20160922

[tor-commits] [webwml/master] Two more blog url fixes

2016-09-22 Thread sebastian

commit e233c2811c1e6b12e21190013a8fdc51ef40e4ee
Author: Sebastian Hahn 
Date:   Fri Sep 23 06:24:06 2016 +0200

Two more blog url fixes
---
 docs/en/faq-abuse.wml | 2 +-
 docs/en/faq.wml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/faq-abuse.wml b/docs/en/faq-abuse.wml
index 17b810f..76d3db3 100644
--- a/docs/en/faq-abuse.wml
+++ b/docs/en/faq-abuse.wml
@@ -164,7 +164,7 @@ using technology?
 types, see the collection of templates
 on the Tor wiki. You can also proactively reduce the amount of abuse 
you
-get by following these tips
+get by following these tips
 for running an exit node with minimal harassment and running a reduced exit policy.
 
diff --git a/docs/en/faq.wml b/docs/en/faq.wml
index abf47de..301b6a4 100644
--- a/docs/en/faq.wml
+++ b/docs/en/faq.wml
@@ -2366,7 +2366,7 @@ on
 issues you might
 encounter
 if you use the default exit policy, and then read Mike Perry's
-tips
+tips
 for running an exit node with minimal harassment.
 
 

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

[tor-commits] [webwml/master] Fix broken blog link (thanks dmr)

2016-09-22 Thread sebastian

commit ff3ba9097697cd6e260697073628d14d2144c2da
Author: Sebastian Hahn 
Date:   Fri Sep 23 06:19:02 2016 +0200

Fix broken blog link (thanks dmr)

*shakes fist angrily at people editing blog titles*
---
 eff/en/tor-legal-faq.wml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eff/en/tor-legal-faq.wml b/eff/en/tor-legal-faq.wml
index 16ac0af..09d265a 100644
--- a/eff/en/tor-legal-faq.wml
+++ b/eff/en/tor-legal-faq.wml
@@ -107,7 +107,7 @@ you. These relays do not directly forward traffic to the 
Internet and so
 can't be easily mistaken for the origin of allegedly unlawful content.
 
 The Tor Project's blog has some excellent https://blog.torproject.org/blog/tips-running-exit-node-minimal-harassment;>recommendations
+href="https://blog.torproject.org/blog/tips-running-exit-node;>recommendations
 for running an exit with as little risk as possible. We suggest that
 you review their advice before setting up an exit relay.
 
@@ -146,7 +146,7 @@ responsible for the content. This could mean the difference 
between
 having your computer seized by law enforcement and being left alone.
 
 The Tor Project https://blog.torproject.org/blog/tips-running-exit-node-minimal-harassment;>suggests
+href="https://blog.torproject.org/blog/tips-running-exit-node;>suggests
 the following ways to let others know that you're running an exit
 relay:
 

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

[tor-commits] [tor/master] Copy 0.2.8.8 changelog entries forward

2016-09-22 Thread nickm

commit 5d1095b1ccc7d4b5c0a40d2017b0240d7107cfac
Author: Nick Mathewson 
Date:   Thu Sep 22 18:24:03 2016 -0400

Copy 0.2.8.8 changelog entries forward
---
 ChangeLog | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f422fd8..6cdd92b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,19 @@ Changes in version 0.2.9.3-alpha - 2016-09-2?
   resolves several bugs -- including a pair of crash bugs from the 0.2.8
   series. Anybody running an earlier version of 0.2.9.x should upgrade.
 
-  X Add items from the 0.2.8.8 changelog.
+  o Major bugfixes (crash, also in 0.2.8.8):
+- Fix a complicated crash bug that could affect Tor clients
+  configured to use bridges when replacing a networkstatus consensus
+  in which one of their bridges was mentioned. OpenBSD users saw
+  more crashes here, but all platforms were potentially affected.
+  Fixes bug 20103; bugfix on 0.2.8.2-alpha.
+
+  o Major bugfixes (relay, OOM handler, also in 0.2.8.8):
+- Fix a timing-dependent assertion failure that could occur when we
+  tried to flush from a circuit after having freed its cells because
+  of an out-of-memory condition. Fixes bug 20203; bugfix on
+  0.2.8.1-alpha. Thanks to "cypherpunks" for help diagnosing
+  this one.
 
   o Major features (circuit building, security):
 - Authorities, relays and clients specifically check that each
@@ -64,6 +76,10 @@ Changes in version 0.2.9.3-alpha - 2016-09-2?
   We believe that no such clients currently exist, since we have
   required OpenSSL 0.9.7 or later since 2009. Closes ticket 19998.
 
+  o Minor features (geoip, also in 0.2.8.8):
+- Update geoip and geoip6 to the September 6 2016 Maxmind GeoLite2
+  Country database.
+
   o Minor feature (port flags):
 - Add *Port flags NoDNSRequest and NoOnionTraffic, and the synthetic
   flag OnionTrafficOnly, which is equivalent to NoDNSRequest,

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

[tor-commits] [tor/master] remove changes files that are also in 0.2.8.8

2016-09-22 Thread nickm

commit 94989fdebb7a587057a0e54172563d4a36c55eee
Author: Nick Mathewson 
Date:   Thu Sep 22 18:14:29 2016 -0400

remove changes files that are also in 0.2.8.8
---
 changes/bug20103| 7 ---
 changes/bug20203| 6 --
 changes/geoip-september2016 | 4 
 3 files changed, 17 deletions(-)

diff --git a/changes/bug20103 b/changes/bug20103
deleted file mode 100644
index bf0aeec..000
--- a/changes/bug20103
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Major bugfixes (crash):
-
-- Fix a complicated crash bug that could affect Tor clients
-  configured to use bridges when replacing a networkstatus consensus
-  in which one of their bridges was mentioned. OpenBSD users saw
-  more crashes here, but all platforms were potentially affected.
-  Fixes bug 20103; bugfix on 0.2.8.2-alpha.
diff --git a/changes/bug20203 b/changes/bug20203
deleted file mode 100644
index 711c91b..000
--- a/changes/bug20203
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (relay, OOM handler):
-- Fix a timing-dependent assertion failure that could occur when we
-  tried to flush from a circuit after having freed its cells because
-  of an out-of-memory condition. Fixes bug 20203; bugfix on
-  0.2.8.1-alpha. Thanks to "cypherpunks" for help diagnosing this
-  one.
diff --git a/changes/geoip-september2016 b/changes/geoip-september2016
deleted file mode 100644
index 1bf5570..000
--- a/changes/geoip-september2016
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (geoip):
-- Update geoip and geoip6 to the September 6 2016 Maxmind GeoLite2
-  Country database.
-



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

[tor-commits] [tor/master] sort entries into a changelog.

2016-09-22 Thread nickm

commit 39733d72ed190759da4b647566ecf45f2b51310d
Author: Nick Mathewson 
Date:   Thu Sep 22 18:22:33 2016 -0400

sort entries into a changelog.
---
 ChangeLog | 218 ++
 1 file changed, 218 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d273b62..b5d5985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,221 @@
+Changes in version 0.2.9.3-alpha - 2016-09-2?
+  Tor 0.2.9.3-alpha adds improved support for entities that
+  want to make high-performance services available through the Tor .onion
+  mechanism without themselves receiving anonymity as they host those
+  services.  It also tries harder to ensure that all steps on a circuit are
+  using the strongest crypto possible, strengthens some TLS properties, and
+  resolves several bugs -- including a pair of crash bugs from the 0.2.8
+  series. Anybody running an earlier version of 0.2.9.x should upgrade.
+
+  X Add items from the 0.2.8.8 changelog.
+
+  o Major features (circuit building, security):
+- Authorities, relays and clients specifically check that each
+  descriptor has an ntor key.
+- Circuit-building code assumes that all hops can use ntor,
+  except for rare hidden service protocol cases.
+- Client code never chooses nodes without ntor keys: they will not
+  be selected during circuit-building, or as guards, or as directory
+  mirrors, or as introduction or rendezvous points.
+- Clients avoid downloading a descriptor if the relay version is
+  too old to support ntor.
+- Tor authorities, relays, and clients only use ntor, except for
+  rare cases in the hidden service protocol.
+
+  o Major features (onion services):
+- Add experimental HiddenServiceSingleHopMode and
+  HiddenServiceNonAnonymousMode options. When both are set to 1, every
+  hidden service on a tor instance becomes a non-anonymous Single Onion
+  Service. Single Onions make one-hop (direct) connections to their
+  introduction and renzedvous points. One-hop circuits make Single Onion
+  servers easily locatable, but clients remain location-anonymous.
+  This is compatible with the existing hidden service implementation, and
+  works on the current tor network without any changes to older relays or
+  clients.
+  Implements proposal 260, completes ticket 17178. Patch by teor and asn.
+
+  o Major features (resource management):
+- Tor now includes support for noticing when we are about to run out of
+  sockets, and preemptively closing connections of lower priority.
+  (This feature is off by default for now, since the current prioritizing
+  method is not mature enough yet. You can enable it by setting
+  "DisableOOSCheck 0".) Closes ticket 18640.
+
+  o Major bugfixes (circuit building):
+- Hidden service client-to-intro-point and service-to-rendezvous-point
+  cicruitss use the TAP key supplied by the protocol, to avoid
+  epistemic attacks.
+  Fixes bug 19163; bugfix on 0.2.4.18-rc.
+
+  o Major bugfixes (compilation, OpenBSD):
+- Fix a Libevent-detection bug in our autoconf script that would
+  prevent Tor from linking successfully on OpenBSD. Patch from
+  rubiate. Fixes bug 19902; bugfix on 0.2.9.1-alpha.
+
+  o Major bugfixes (hidden services):
+- Clients require hidden services to include the TAP keys
+  for their intro points in the hidden service descriptor.
+  This prevents an inadvertent upgrade to ntor, which a
+  malicious hidden service could use to discover which
+  consensus a client has.
+  Fixes bug 20012; bugfix on 0.2.4.8-alpha. Patch by teor.
+
+  o Minor feature (port flags):
+- Add *Port flags NoDNSRequest and NoOnionTraffic, and
+  the synthetic flag OnionTrafficOnly, which is equivalent to
+  NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic.
+  Closes enhancement 18693; patch by "teor".
+
+  o Minor features (testing, ipv6):
+- Add the single-onion and single-onion-ipv6 chutney targets to
+  make test-network-all. This requires a recent chutney version
+  with the single onion network flavours (git c72a652 or later).
+  Closes ticket 20072; patch by teor.
+- Add the hs-ipv6 chutney target to make test-network-all's IPv6
+  tests. Remove bridges+hs, as it's somewhat redundant.
+  This requires a recent chutney version that supports IPv6 clients,
+  relays, and authorities.
+  Closes ticket 20069; patch by teor.
+
+  o Minor features (directory authority):
+- After voting, if the authorities decide that a relay is not "Valid",
+  they no longer include it in the consensus at all. Closes ticket
+  20002; implements part of proposal 272.
+
+  o Minor features (security, TLS):
+- Servers no longer support clients that do not provide AES
+  ciphersuites. (3DES is no longer considered an acceptable
+  cipher.) We believe that no such

[tor-commits] [tor/master] Reflow the changelog

2016-09-22 Thread nickm

commit 7f074c3fa7a095805fb683808ddb3b246e4803b4
Author: Nick Mathewson 
Date:   Thu Sep 22 18:22:47 2016 -0400

Reflow the changelog
---
 ChangeLog | 263 ++
 1 file changed, 129 insertions(+), 134 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b5d5985..f422fd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,9 @@
 Changes in version 0.2.9.3-alpha - 2016-09-2?
-  Tor 0.2.9.3-alpha adds improved support for entities that
-  want to make high-performance services available through the Tor .onion
-  mechanism without themselves receiving anonymity as they host those
-  services.  It also tries harder to ensure that all steps on a circuit are
-  using the strongest crypto possible, strengthens some TLS properties, and
+  Tor 0.2.9.3-alpha adds improved support for entities that want to make
+  high-performance services available through the Tor .onion mechanism
+  without themselves receiving anonymity as they host those services. It
+  also tries harder to ensure that all steps on a circuit are using the
+  strongest crypto possible, strengthens some TLS properties, and
   resolves several bugs -- including a pair of crash bugs from the 0.2.8
   series. Anybody running an earlier version of 0.2.9.x should upgrade.
 
@@ -12,40 +12,39 @@ Changes in version 0.2.9.3-alpha - 2016-09-2?
   o Major features (circuit building, security):
 - Authorities, relays and clients specifically check that each
   descriptor has an ntor key.
-- Circuit-building code assumes that all hops can use ntor,
-  except for rare hidden service protocol cases.
+- Circuit-building code assumes that all hops can use ntor, except
+  for rare hidden service protocol cases.
 - Client code never chooses nodes without ntor keys: they will not
   be selected during circuit-building, or as guards, or as directory
   mirrors, or as introduction or rendezvous points.
-- Clients avoid downloading a descriptor if the relay version is
-  too old to support ntor.
+- Clients avoid downloading a descriptor if the relay version is too
+  old to support ntor.
 - Tor authorities, relays, and clients only use ntor, except for
   rare cases in the hidden service protocol.
 
   o Major features (onion services):
 - Add experimental HiddenServiceSingleHopMode and
-  HiddenServiceNonAnonymousMode options. When both are set to 1, every
-  hidden service on a tor instance becomes a non-anonymous Single Onion
-  Service. Single Onions make one-hop (direct) connections to their
-  introduction and renzedvous points. One-hop circuits make Single Onion
-  servers easily locatable, but clients remain location-anonymous.
-  This is compatible with the existing hidden service implementation, and
-  works on the current tor network without any changes to older relays or
-  clients.
-  Implements proposal 260, completes ticket 17178. Patch by teor and asn.
+  HiddenServiceNonAnonymousMode options. When both are set to 1,
+  every hidden service on a tor instance becomes a non-anonymous
+  Single Onion Service. Single Onions make one-hop (direct)
+  connections to their introduction and renzedvous points. One-hop
+  circuits make Single Onion servers easily locatable, but clients
+  remain location-anonymous. This is compatible with the existing
+  hidden service implementation, and works on the current tor
+  network without any changes to older relays or clients. Implements
+  proposal 260, completes ticket 17178. Patch by teor and asn.
 
   o Major features (resource management):
-- Tor now includes support for noticing when we are about to run out of
-  sockets, and preemptively closing connections of lower priority.
-  (This feature is off by default for now, since the current prioritizing
-  method is not mature enough yet. You can enable it by setting
-  "DisableOOSCheck 0".) Closes ticket 18640.
+- Tor now includes support for noticing when we are about to run out
+  of sockets, and preemptively closing connections of lower
+  priority. (This feature is off by default for now, since the
+  current prioritizing method is not mature enough yet. You can
+  enable it by setting "DisableOOSCheck 0".) Closes ticket 18640.
 
   o Major bugfixes (circuit building):
-- Hidden service client-to-intro-point and service-to-rendezvous-point
-  cicruitss use the TAP key supplied by the protocol, to avoid
-  epistemic attacks.
-  Fixes bug 19163; bugfix on 0.2.4.18-rc.
+- Hidden service client-to-intro-point and service-to-rendezvous-
+  point cicruitss use the TAP key supplied by the protocol, to avoid
+  epistemic attacks. Fixes bug 19163; bugfix on 0.2.4.18-rc.
 
   o Major bugfixes (compilation, OpenBSD):
 - Fix a Libevent-detection bug in our autoconf script that would
@@

[tor-commits] [tor/master] Update versions to 0.2.8.8

2016-09-22 Thread nickm

commit ad1824f91de0a1acdc4b2830f5b7b6d841dc6eef
Author: Nick Mathewson 
Date:   Thu Sep 22 15:37:06 2016 -0400

Update versions to 0.2.8.8
---
 configure.ac| 2 +-
 contrib/win32build/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 76080f4..6150e7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.7-dev])
+AC_INIT([tor],[0.2.8.8])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 1b0c23d..a4c98cd 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.7-dev"
+!define VERSION "0.2.8.8"
 !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 a3ad9de..2ca3448 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.7-dev"
+#define VERSION "0.2.8.8"
 
 
 



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

[tor-commits] [tor/master] bump master to 0.2.9.3-alpha

2016-09-22 Thread nickm

commit 33f81b8712cc28fab6c66a035889a277a3a0cdef
Author: Nick Mathewson 
Date:   Thu Sep 22 16:11:50 2016 -0400

bump master to 0.2.9.3-alpha
---
 configure.ac| 2 +-
 contrib/win32build/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 fc27017..92a90ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.2-alpha-dev])
+AC_INIT([tor],[0.2.9.3-alpha])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 9eec555..2d29666 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.9.2-alpha-dev"
+!define VERSION "0.2.9.3-alpha"
 !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 1e1c31d..2f44ba0 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.9.2-alpha-dev"
+#define VERSION "0.2.9.3-alpha"
 
 
 

___
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.8] Merge branch 'maint-0.2.8' into release-0.2.8

2016-09-22 Thread nickm

commit 53d4c505cda3e129092366f863ce16a4ad192cfa
Merge: 31df6a7 ad1824f
Author: Nick Mathewson 
Date:   Thu Sep 22 15:37:12 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 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/maint-0.2.8] Update versions to 0.2.8.8

2016-09-22 Thread nickm

commit ad1824f91de0a1acdc4b2830f5b7b6d841dc6eef
Author: Nick Mathewson 
Date:   Thu Sep 22 15:37:06 2016 -0400

Update versions to 0.2.8.8
---
 configure.ac| 2 +-
 contrib/win32build/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 76080f4..6150e7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.7-dev])
+AC_INIT([tor],[0.2.8.8])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 1b0c23d..a4c98cd 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.7-dev"
+!define VERSION "0.2.8.8"
 !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 a3ad9de..2ca3448 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.7-dev"
+#define VERSION "0.2.8.8"
 
 
 

___
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 'maint-0.2.8'

2016-09-22 Thread nickm

commit f5deb2feaa0105610002459ad3f0defd3f33a534
Merge: 077f6a4 ad1824f
Author: Nick Mathewson 
Date:   Thu Sep 22 15:37:27 2016 -0400

Merge branch 'maint-0.2.8'




___
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.8] Start on an 0.2.8.8 changelog.

2016-09-22 Thread nickm

commit 31df6a7a2355fc6daa4eb327a1c81b1c81daff45
Author: Nick Mathewson 
Date:   Thu Sep 22 15:28:26 2016 -0400

Start on an 0.2.8.8 changelog.
---
 ChangeLog   | 24 
 changes/bug20103|  7 ---
 changes/bug20203|  6 --
 changes/geoip-september2016 |  4 
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cbf818b..34526be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+Changes in version 0.2.8.8 - 2016-09-2?
+  Tor 0.2.8.8 fixes two crash bugs present in previous versions of the
+  0.2.8.x series. Relays running 0.2.8.x should upgrade, as should users
+  who select public relays as their bridges.
+
+  o Major bugfixes (crash):
+- Fix a complicated crash bug that could affect Tor clients
+  configured to use bridges when replacing a networkstatus consensus
+  in which one of their bridges was mentioned. OpenBSD users saw
+  more crashes here, but all platforms were potentially affected.
+  Fixes bug 20103; bugfix on 0.2.8.2-alpha.
+
+  o Major bugfixes (relay, OOM handler):
+- Fix a timing-dependent assertion failure that could occur when we
+  tried to flush from a circuit after having freed its cells because
+  of an out-of-memory condition. Fixes bug 20203; bugfix on
+  0.2.8.1-alpha. Thanks to "cypherpunks" for help diagnosing
+  this one.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the September 6 2016 Maxmind GeoLite2
+  Country database.
+
+
 Changes in version 0.2.8.7 - 2016-08-24
   Tor 0.2.8.7 fixes an important bug related to the ReachableAddresses
   option in 0.2.8.6, and replaces a retiring bridge authority. Everyone
diff --git a/changes/bug20103 b/changes/bug20103
deleted file mode 100644
index bf0aeec..000
--- a/changes/bug20103
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Major bugfixes (crash):
-
-- Fix a complicated crash bug that could affect Tor clients
-  configured to use bridges when replacing a networkstatus consensus
-  in which one of their bridges was mentioned. OpenBSD users saw
-  more crashes here, but all platforms were potentially affected.
-  Fixes bug 20103; bugfix on 0.2.8.2-alpha.
diff --git a/changes/bug20203 b/changes/bug20203
deleted file mode 100644
index 711c91b..000
--- a/changes/bug20203
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (relay, OOM handler):
-- Fix a timing-dependent assertion failure that could occur when we
-  tried to flush from a circuit after having freed its cells because
-  of an out-of-memory condition. Fixes bug 20203; bugfix on
-  0.2.8.1-alpha. Thanks to "cypherpunks" for help diagnosing this
-  one.
diff --git a/changes/geoip-september2016 b/changes/geoip-september2016
deleted file mode 100644
index 1bf5570..000
--- a/changes/geoip-september2016
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (geoip):
-- Update geoip and geoip6 to the September 6 2016 Maxmind GeoLite2
-  Country database.
-



___
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.8] Update versions to 0.2.8.8

2016-09-22 Thread nickm

commit ad1824f91de0a1acdc4b2830f5b7b6d841dc6eef
Author: Nick Mathewson 
Date:   Thu Sep 22 15:37:06 2016 -0400

Update versions to 0.2.8.8
---
 configure.ac| 2 +-
 contrib/win32build/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 76080f4..6150e7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.7-dev])
+AC_INIT([tor],[0.2.8.8])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 1b0c23d..a4c98cd 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.7-dev"
+!define VERSION "0.2.8.8"
 !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 a3ad9de..2ca3448 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.7-dev"
+#define VERSION "0.2.8.8"
 
 
 



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

[tor-commits] [tor/master] LintChanges fix

2016-09-22 Thread nickm

commit d78711c0ae83c505a966791a18a6b8d5b7e4a8d1
Author: Nick Mathewson 
Date:   Thu Sep 22 15:19:59 2016 -0400

LintChanges fix
---
 changes/bug20203 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/bug20203 b/changes/bug20203
index b4809ff..711c91b 100644
--- a/changes/bug20203
+++ b/changes/bug20203
@@ -1,4 +1,4 @@
-  o Major bugfixes (relay, OOM handler)
+  o Major bugfixes (relay, OOM handler):
 - Fix a timing-dependent assertion failure that could occur when we
   tried to flush from a circuit after having freed its cells because
   of an out-of-memory condition. Fixes bug 20203; bugfix on



___
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 'maint-0.2.8'

2016-09-22 Thread nickm

commit 077f6a4888e88a4895e7b2234ff2fd81412307d0
Merge: 0baa276 d78711c
Author: Nick Mathewson 
Date:   Thu Sep 22 15:20:31 2016 -0400

Merge branch 'maint-0.2.8'

 changes/bug20203 |  6 ++
 src/or/circuitlist.c | 10 --
 src/or/relay.c   |  9 +
 3 files changed, 23 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/release-0.2.8] When clearing cells from a circuit for OOM reasons, tell cmux we did so.

2016-09-22 Thread nickm

commit e4aaf7666028c30866ad63053ad9f6eb6bf16bf7
Author: Nick Mathewson 
Date:   Wed Sep 21 19:01:12 2016 -0400

When clearing cells from a circuit for OOM reasons, tell cmux we did so.

Not telling the cmux would sometimes cause an assertion failure in
relay.c when we tried to get an active circuit and found an "active"
circuit with no cells.

Additionally, replace that assert with a test and a log message.

Fix for bug 20203. This is actually probably a bugfix on
0.2.8.1-alpha, specifically my code in 8b4e5b7ee902fb7fa0776 where I
made circuit_mark_for_close_() do less in order to simplify our call
graph. Thanks to "cypherpunks" for help diagnosing.
---
 changes/bug20203 |  6 ++
 src/or/circuitlist.c | 10 --
 src/or/relay.c   |  9 +
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/changes/bug20203 b/changes/bug20203
new file mode 100644
index 000..b4809ff
--- /dev/null
+++ b/changes/bug20203
@@ -0,0 +1,6 @@
+  o Major bugfixes (relay, OOM handler)
+- Fix a timing-dependent assertion failure that could occur when we
+  tried to flush from a circuit after having freed its cells because
+  of an out-of-memory condition. Fixes bug 20203; bugfix on
+  0.2.8.1-alpha. Thanks to "cypherpunks" for help diagnosing this
+  one.
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 716024d..5fb8be5 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1836,8 +1836,14 @@ marked_circuit_free_cells(circuit_t *circ)
 return;
   }
   cell_queue_clear(>n_chan_cells);
-  if (! CIRCUIT_IS_ORIGIN(circ))
-cell_queue_clear(& TO_OR_CIRCUIT(circ)->p_chan_cells);
+  if (circ->n_mux)
+circuitmux_clear_num_cells(circ->n_mux, circ);
+  if (! CIRCUIT_IS_ORIGIN(circ)) {
+or_circuit_t *orcirc = TO_OR_CIRCUIT(circ);
+cell_queue_clear(>p_chan_cells);
+if (orcirc->p_mux)
+  circuitmux_clear_num_cells(orcirc->p_mux, circ);
+  }
 }
 
 static size_t
diff --git a/src/or/relay.c b/src/or/relay.c
index eddad6a..33191e1 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2619,6 +2619,15 @@ channel_flush_from_first_active_circuit, (channel_t 
*chan, int max))
 }
 
 /* Circuitmux told us this was active, so it should have cells */
+if (/*BUG(*/ queue->n == 0 /*)*/) {
+  log_warn(LD_BUG, "Found a supposedly active circuit with no cells "
+   "to send. Trying to recover.");
+  circuitmux_set_num_cells(cmux, circ, 0);
+  if (! circ->marked_for_close)
+circuit_mark_for_close(circ, END_CIRC_REASON_INTERNAL);
+  continue;
+}
+
 tor_assert(queue->n > 0);
 
 /*



___
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 'bug20203_027_squashed' into maint-0.2.8

2016-09-22 Thread nickm

commit 6e96eababe8f05ac03b2e83911e6fae5654884b4
Merge: 1edea87 e4aaf76
Author: Nick Mathewson 
Date:   Thu Sep 22 15:17:00 2016 -0400

Merge branch 'bug20203_027_squashed' into maint-0.2.8

 changes/bug20203 |  6 ++
 src/or/circuitlist.c | 10 --
 src/or/relay.c   |  9 +
 3 files changed, 23 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/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2016-09-22 Thread nickm

commit 7df4f23d952f892c09f5ef930e9e4f297f784cce
Merge: caa16bf d78711c
Author: Nick Mathewson 
Date:   Thu Sep 22 15:20:19 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug20203 |  6 ++
 src/or/circuitlist.c | 10 --
 src/or/relay.c   |  9 +
 3 files changed, 23 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/master] When clearing cells from a circuit for OOM reasons, tell cmux we did so.

2016-09-22 Thread nickm

commit e4aaf7666028c30866ad63053ad9f6eb6bf16bf7
Author: Nick Mathewson 
Date:   Wed Sep 21 19:01:12 2016 -0400

When clearing cells from a circuit for OOM reasons, tell cmux we did so.

Not telling the cmux would sometimes cause an assertion failure in
relay.c when we tried to get an active circuit and found an "active"
circuit with no cells.

Additionally, replace that assert with a test and a log message.

Fix for bug 20203. This is actually probably a bugfix on
0.2.8.1-alpha, specifically my code in 8b4e5b7ee902fb7fa0776 where I
made circuit_mark_for_close_() do less in order to simplify our call
graph. Thanks to "cypherpunks" for help diagnosing.
---
 changes/bug20203 |  6 ++
 src/or/circuitlist.c | 10 --
 src/or/relay.c   |  9 +
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/changes/bug20203 b/changes/bug20203
new file mode 100644
index 000..b4809ff
--- /dev/null
+++ b/changes/bug20203
@@ -0,0 +1,6 @@
+  o Major bugfixes (relay, OOM handler)
+- Fix a timing-dependent assertion failure that could occur when we
+  tried to flush from a circuit after having freed its cells because
+  of an out-of-memory condition. Fixes bug 20203; bugfix on
+  0.2.8.1-alpha. Thanks to "cypherpunks" for help diagnosing this
+  one.
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 716024d..5fb8be5 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1836,8 +1836,14 @@ marked_circuit_free_cells(circuit_t *circ)
 return;
   }
   cell_queue_clear(>n_chan_cells);
-  if (! CIRCUIT_IS_ORIGIN(circ))
-cell_queue_clear(& TO_OR_CIRCUIT(circ)->p_chan_cells);
+  if (circ->n_mux)
+circuitmux_clear_num_cells(circ->n_mux, circ);
+  if (! CIRCUIT_IS_ORIGIN(circ)) {
+or_circuit_t *orcirc = TO_OR_CIRCUIT(circ);
+cell_queue_clear(>p_chan_cells);
+if (orcirc->p_mux)
+  circuitmux_clear_num_cells(orcirc->p_mux, circ);
+  }
 }
 
 static size_t
diff --git a/src/or/relay.c b/src/or/relay.c
index eddad6a..33191e1 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2619,6 +2619,15 @@ channel_flush_from_first_active_circuit, (channel_t 
*chan, int max))
 }
 
 /* Circuitmux told us this was active, so it should have cells */
+if (/*BUG(*/ queue->n == 0 /*)*/) {
+  log_warn(LD_BUG, "Found a supposedly active circuit with no cells "
+   "to send. Trying to recover.");
+  circuitmux_set_num_cells(cmux, circ, 0);
+  if (! circ->marked_for_close)
+circuit_mark_for_close(circ, END_CIRC_REASON_INTERNAL);
+  continue;
+}
+
 tor_assert(queue->n > 0);
 
 /*



___
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.8] LintChanges fix

2016-09-22 Thread nickm

commit d78711c0ae83c505a966791a18a6b8d5b7e4a8d1
Author: Nick Mathewson 
Date:   Thu Sep 22 15:19:59 2016 -0400

LintChanges fix
---
 changes/bug20203 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/bug20203 b/changes/bug20203
index b4809ff..711c91b 100644
--- a/changes/bug20203
+++ b/changes/bug20203
@@ -1,4 +1,4 @@
-  o Major bugfixes (relay, OOM handler)
+  o Major bugfixes (relay, OOM handler):
 - Fix a timing-dependent assertion failure that could occur when we
   tried to flush from a circuit after having freed its cells because
   of an out-of-memory condition. Fixes bug 20203; bugfix on



___
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.8] Merge branch 'bug20203_027_squashed' into maint-0.2.8

2016-09-22 Thread nickm

commit 6e96eababe8f05ac03b2e83911e6fae5654884b4
Merge: 1edea87 e4aaf76
Author: Nick Mathewson 
Date:   Thu Sep 22 15:17:00 2016 -0400

Merge branch 'bug20203_027_squashed' into maint-0.2.8

 changes/bug20203 |  6 ++
 src/or/circuitlist.c | 10 --
 src/or/relay.c   |  9 +
 3 files changed, 23 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.8] Merge branch 'bug20203_027_squashed' into maint-0.2.8

2016-09-22 Thread nickm

commit 6e96eababe8f05ac03b2e83911e6fae5654884b4
Merge: 1edea87 e4aaf76
Author: Nick Mathewson 
Date:   Thu Sep 22 15:17:00 2016 -0400

Merge branch 'bug20203_027_squashed' into maint-0.2.8

 changes/bug20203 |  6 ++
 src/or/circuitlist.c | 10 --
 src/or/relay.c   |  9 +
 3 files changed, 23 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.8] LintChanges fix

2016-09-22 Thread nickm

commit d78711c0ae83c505a966791a18a6b8d5b7e4a8d1
Author: Nick Mathewson 
Date:   Thu Sep 22 15:19:59 2016 -0400

LintChanges fix
---
 changes/bug20203 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/bug20203 b/changes/bug20203
index b4809ff..711c91b 100644
--- a/changes/bug20203
+++ b/changes/bug20203
@@ -1,4 +1,4 @@
-  o Major bugfixes (relay, OOM handler)
+  o Major bugfixes (relay, OOM handler):
 - Fix a timing-dependent assertion failure that could occur when we
   tried to flush from a circuit after having freed its cells because
   of an out-of-memory condition. Fixes bug 20203; bugfix on

___
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.8] When clearing cells from a circuit for OOM reasons, tell cmux we did so.

2016-09-22 Thread nickm

commit e4aaf7666028c30866ad63053ad9f6eb6bf16bf7
Author: Nick Mathewson 
Date:   Wed Sep 21 19:01:12 2016 -0400

When clearing cells from a circuit for OOM reasons, tell cmux we did so.

Not telling the cmux would sometimes cause an assertion failure in
relay.c when we tried to get an active circuit and found an "active"
circuit with no cells.

Additionally, replace that assert with a test and a log message.

Fix for bug 20203. This is actually probably a bugfix on
0.2.8.1-alpha, specifically my code in 8b4e5b7ee902fb7fa0776 where I
made circuit_mark_for_close_() do less in order to simplify our call
graph. Thanks to "cypherpunks" for help diagnosing.
---
 changes/bug20203 |  6 ++
 src/or/circuitlist.c | 10 --
 src/or/relay.c   |  9 +
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/changes/bug20203 b/changes/bug20203
new file mode 100644
index 000..b4809ff
--- /dev/null
+++ b/changes/bug20203
@@ -0,0 +1,6 @@
+  o Major bugfixes (relay, OOM handler)
+- Fix a timing-dependent assertion failure that could occur when we
+  tried to flush from a circuit after having freed its cells because
+  of an out-of-memory condition. Fixes bug 20203; bugfix on
+  0.2.8.1-alpha. Thanks to "cypherpunks" for help diagnosing this
+  one.
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 716024d..5fb8be5 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1836,8 +1836,14 @@ marked_circuit_free_cells(circuit_t *circ)
 return;
   }
   cell_queue_clear(>n_chan_cells);
-  if (! CIRCUIT_IS_ORIGIN(circ))
-cell_queue_clear(& TO_OR_CIRCUIT(circ)->p_chan_cells);
+  if (circ->n_mux)
+circuitmux_clear_num_cells(circ->n_mux, circ);
+  if (! CIRCUIT_IS_ORIGIN(circ)) {
+or_circuit_t *orcirc = TO_OR_CIRCUIT(circ);
+cell_queue_clear(>p_chan_cells);
+if (orcirc->p_mux)
+  circuitmux_clear_num_cells(orcirc->p_mux, circ);
+  }
 }
 
 static size_t
diff --git a/src/or/relay.c b/src/or/relay.c
index eddad6a..33191e1 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2619,6 +2619,15 @@ channel_flush_from_first_active_circuit, (channel_t 
*chan, int max))
 }
 
 /* Circuitmux told us this was active, so it should have cells */
+if (/*BUG(*/ queue->n == 0 /*)*/) {
+  log_warn(LD_BUG, "Found a supposedly active circuit with no cells "
+   "to send. Trying to recover.");
+  circuitmux_set_num_cells(cmux, circ, 0);
+  if (! circ->marked_for_close)
+circuit_mark_for_close(circ, END_CIRC_REASON_INTERNAL);
+  continue;
+}
+
 tor_assert(queue->n > 0);
 
 /*



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

[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2016-09-22 Thread translation

commit 497f65042b2a60c3181e801a320a2aa569e72885
Author: Translation commit bot 
Date:   Thu Sep 22 19:18:10 2016 +

Update translations for tor-messenger-prefsdtd
---
 ar/prefs.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ar/prefs.dtd b/ar/prefs.dtd
index 05e2d03..3c9883b 100644
--- a/ar/prefs.dtd
+++ b/ar/prefs.dtd
@@ -16,7 +16,7 @@
 
 
 
-
-
+
+
 
 
\ No newline at end of file

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

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2016-09-22 Thread translation

commit de091ddc3cfcf0a394b89d00c0e8a9066afc1825
Author: Translation commit bot 
Date:   Thu Sep 22 19:17:54 2016 +

Update translations for tor-messenger-ircproperties
---
 ar/irc.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ar/irc.properties b/ar/irc.properties
index e2648dd..ae1af92 100644
--- a/ar/irc.properties
+++ b/ar/irc.properties
@@ -28,7 +28,7 @@ joinChat.password=_Password
 options.server=Ø®Ø§Ø¯Ù
 options.port=Ø¨ÙØ§Ø¨Ø©
 options.ssl=Ø§Ø³ØªØ¹ÙÙ SSL
-options.encoding=Character Set
+options.encoding=ÙØ¬ÙÙØ¹Ø© Ø§ÙØ£ØØ±Ù
 options.quitMessage=Ø¥ÙÙÙ Ø§ÙØ±Ø³Ø§ÙØ©
 options.partMessage=Ø¬Ø²Ø¡ Ø§ÙØ±Ø³Ø§ÙØ©
 options.showServerTab=Ø§Ø¹Ø±Ø¶ Ø§ÙØ±Ø³Ø§Ø¦Ù ÙÙ Ø§ÙØ®Ø§Ø¯Ù
@@ -166,7 +166,7 @@ error.channelFull=Ø§ÙÙÙØ§Ø© %S ÙØªÙØ¦Ù
 error.inviteOnly=You must be invited to join %S.
 error.nonUniqueTarget=%S is not a unique user@host or shortname or you have 
tried to join too many channels at once.
 error.notChannelOp=ÙÙØ³ÙØª ÙÙØ´ÙØºÙÙ ÙÙÙØ§Ø© ÙÙ S%
-error.notChannelOwner=You are not a channel owner of %S.
+error.notChannelOwner=ÙØ³Øª ØµØ§ØØ¨ Ø§ÙÙÙØ§Ø© %S.
 error.wrongKey=Cannot join %S, invalid channel password.
 error.sendMessageFailed=An error occurred while sending your last message. 
Please try again once the connection has been reestablished.
 #%1$S is the channel the user tried to join, %2$S is the channel
@@ -187,7 +187,7 @@ tooltip.server=ÙØªØµÙ Ø¨
 #protect users).
 tooltip.connectedFrom=ÙØªØµÙ ÙÙ
 tooltip.registered=ÙØ³Ø¬Ù
-tooltip.registeredAs=Registered as
+tooltip.registeredAs=ÙØ³Ø¬Ù Ø¨Ø§Ø³Ù
 tooltip.secure=Ø§Ø³ØªØ®Ø¯Ø§Ù Ø§ØªØµØ§Ù Ø¢ÙÙ
 # The away message of the user
 tooltip.away=Ø¨Ø¹ÙØ¯

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

[tor-commits] [translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties

2016-09-22 Thread translation

commit fa33a07c9d6d54c4ed2d88d829edb61b1e58d5fd
Author: Translation commit bot 
Date:   Thu Sep 22 19:17:34 2016 +

Update translations for tor-messenger-conversationsproperties
---
 ar/conversations.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ar/conversations.properties b/ar/conversations.properties
index 649725d..1c17fcc 100644
--- a/ar/conversations.properties
+++ b/ar/conversations.properties
@@ -10,18 +10,18 @@ targetChanged=Ø§ÙÙØØ§Ø¯Ø«Ù ÙØ¹ %1$S Ø³ØªØ³ØªÙÙÙ 
Ø¹Ù Ø·Ø±ÙÙ %2$S.
 # LOCALIZATION NOTE (statusChanged):
 #  %1$S is the display name of the contact.
 #  %2$S is the new status type (a value from status.properties).
-statusChanged=%1$S is now %2$S.
+statusChanged=%1$S ÙÙ Ø§ÙØ¢Ù %2$S.
 # LOCALIZATION NOTE (statusChangedWithStatusText):
 #  %1$S is the display name of the contact.
 #  %2$S is the new status type (a value from status.properties).
 #  %3$S is the status text (eg. "I'm currently away from the computer").
-statusChangedWithStatusText=%1$S is now %2$S: %3$S.
+statusChangedWithStatusText=%1$S ÙÙ Ø§ÙØ¢Ù %2$S: %3$S.
 # LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]):
 #  special case of the previous 2 strings for when the status was
 #  previously unknown. These 2 strings should not mislead the user
 #  into thinking the person's status has just changed.
-statusChangedFromUnknown=%1$S is %2$S.
-statusChangedFromUnknownWithStatusText=%1$S is %2$S: %3$S.
+statusChangedFromUnknown=%1$S ÙÙ %2$S.
+statusChangedFromUnknownWithStatusText=%1$S ÙÙ %2$S: %3$S.
 # LOCALIZATION NOTE (statusKnown[WithStatusText]):
 # special case of the previous 2 strings for when an account has just
 # been reconnected, so the status is now known. These 2 strings should not

___
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

2016-09-22 Thread translation

commit 6db4fe2074c53ea4796c0eb34c42e34500960171
Author: Translation commit bot 
Date:   Thu Sep 22 19:15:27 2016 +

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

diff --git a/ar/ar.po b/ar/ar.po
index 1eefae3..5107c6e 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -15,13 +15,14 @@
 # Sherief Alaa , 2013
 # taljurf , 2009
 # Yassmin Alkhatib , 2015
+# ÙØÙÙ Ø§ÙØ¯ÙÙ , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-03-21 16:31+\n"
-"Last-Translator: Yassmin Alkhatib \n"
+"PO-Revision-Date: 2016-09-22 18:58+\n"
+"Last-Translator: ÙØÙÙ Ø§ÙØ¯ÙÙ \n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,7 +82,7 @@ msgid ""
 "The encrypted persistent storage of the Tails USB stick that you are 
currently using is not copied.\n"
 "\n"
 ""
-msgstr ""
+msgstr "\nØ«Ø¨ÙÙØª Tails ÙÙ Ø°Ø§ÙØ±Ø© USB Ø£Ø®Ø±Ù Ø¹Ø¨Ø± ÙØ³Ø® 
ÙØ¸Ø§Ù Tails Ø§ÙØ°Ù ØªØ³ØªØ®Ø¯ÙÙ ØØ§ÙÙØ§..\nØ¥Ù Ø°Ø§ÙØ±Ø© 
USB Ø§ÙØªÙ ØªØ«Ø¨Øª ÙÙÙØ§ Ø§ÙÙØ¸Ø§Ù Ø¬Ø±Øª ØªÙÙØ¦ÙØ§ ÙØ¹ÙÙÙ 
ÙØ¥Ù ÙÙ Ø§ÙØ¨ÙØ§ÙØ§Øª Ø§ÙØªÙ Ø¨Ø¯Ø§Ø®ÙÙØ§ ÙÙÙØ¯Øª.\nØ¥Ù 
Ø§ÙØªØ®Ø²ÙÙ Ø§ÙØ«Ø§Ø¨Øª Ø§ÙÙÙØ¹ÙÙÙÙ ÙØ°Ø§ÙØ±Ø© USB ÙÙØ¸Ø§Ù 
Tails Ø§ÙÙØ³ØªØ®Ø¯Ù ØØ§ÙÙØ§ ÙÙ ÙÙØ³ØªÙØ³ÙØ®.\n"
 
 #: ../liveusb/launcher_ui.py:157
 msgid ""

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

[tor-commits] [translation/tails-onioncircuits] Update translations for tails-onioncircuits

2016-09-22 Thread translation

commit 6ff73a45274a68d87046f90e06c4785df92cee8f
Author: Translation commit bot 
Date:   Thu Sep 22 18:48:40 2016 +

Update translations for tails-onioncircuits
---
 ar/onioncircuits.pot | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ar/onioncircuits.pot b/ar/onioncircuits.pot
index c170fcc..0a8ea5c 100644
--- a/ar/onioncircuits.pot
+++ b/ar/onioncircuits.pot
@@ -5,13 +5,14 @@
 # Translators:
 # Ahmed Alhammadi <66222...@gmail.com>, 2016
 # crash x , 2016
+# Singapore Goldindor, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-31 14:42+0200\n"
-"PO-Revision-Date: 2016-09-14 10:52+\n"
-"Last-Translator: crash x \n"
+"PO-Revision-Date: 2016-09-22 18:28+\n"
+"Last-Translator: Singapore Goldindor\n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,11 +26,11 @@ msgstr "Ø£ÙØª ÙÙ ØªØ±ØªØ¨Ø· Ø¨ØªÙØ± Ø¨Ø¹Ø¯.."
 
 #: ../onioncircuits:95
 msgid "Onion Circuits"
-msgstr ""
+msgstr "Ø¯Ø§Ø¦Ø±Ø© Ø§ÙÙÙÙÙ"
 
 #: ../onioncircuits:125
 msgid "Circuit"
-msgstr ""
+msgstr "Ø¯Ø§Ø¦Ø±Ø©"
 
 #: ../onioncircuits:126
 msgid "Status"

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

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2016-09-22 Thread translation

commit a3e8bf5c141e2bf50b67375778f1555827385b65
Author: Translation commit bot 
Date:   Thu Sep 22 18:48:29 2016 +

Update translations for tails-openpgp-applet
---
 ar/openpgp-applet.pot | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ar/openpgp-applet.pot b/ar/openpgp-applet.pot
index 4518ba8..0de9b2a 100644
--- a/ar/openpgp-applet.pot
+++ b/ar/openpgp-applet.pot
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # ouss , 2016
+# Singapore Goldindor, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: ouss \n"
+"PO-Revision-Date: 2016-09-22 18:43+\n"
+"Last-Translator: Singapore Goldindor\n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,7 +53,7 @@ msgstr "Ø¥Ø¯Ø§Ø±Ø© Ø§ÙÙÙØ§ØªÙØ"
 
 #: bin/openpgp-applet:251
 msgid "_Open Text Editor"
-msgstr ""
+msgstr "_ÙØªØ ÙØØ±Ø± Ø§ÙÙØµ"
 
 #: bin/openpgp-applet:295
 msgid "The clipboard does not contain valid input data."

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

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2016-09-22 Thread translation

commit 1ef306de9f3b8ce867d68573ce79899663955c26
Author: Translation commit bot 
Date:   Thu Sep 22 18:47:58 2016 +

Update translations for tor-messenger-ircproperties
---
 ar/irc.properties | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/ar/irc.properties b/ar/irc.properties
index 01dc262..e2648dd 100644
--- a/ar/irc.properties
+++ b/ar/irc.properties
@@ -13,7 +13,7 @@ irc.usernameHint=Ø§Ø®ØªØµØ§Ø±
 #   disconnected because of an error.
 connection.error.lost=ØªÙ ÙÙØ¯Ø§Ù Ø§ÙØ§ØªØµØ§Ù Ø¨Ø§ÙØ®Ø§Ø¯Ù
 connection.error.timeOut=Connection timed out
-connection.error.invalidUsername=%S is not an allowed username
+connection.error.invalidUsername=%S ÙÙØ³ Ø¥Ø³Ù ÙØ³ØªØ®Ø¯Ù ÙØ³ÙÙØ
 connection.error.invalidPassword=ÙÙÙØ© Ø³Ø± Ø§ÙØ®Ø§Ø¯Ù ØºÙØ± ØµØÙØØ©
 connection.error.passwordRequired=ÙØ·ÙÙØ¨ ÙÙÙØ© Ø³Ø±
 
@@ -37,11 +37,11 @@ options.alternateNicks=Alternate nicks
 # LOCALIZATION NOTE (ctcp.version):
 #   %1$S is the nickname of the user whose version was requested.
 #   %2$S is the version response from the client.
-ctcp.version=%1$S is using "%2$S".
+ctcp.version=%1$S ÙØ³ØªØ¹ÙÙ "%2$S".
 # LOCALIZATION NOTE (ctcp.time):
 #   %1$S is the nickname of the user whose time was requested.
 #   %2$S is the time response.
-ctcp.time=The time for %1$S is %2$S.
+ctcp.time=Ø§ÙØ²ÙÙ Ø§ÙØ®Ø§Øµ Ø¨ %1$S ÙÙ %2$S.
 
 # LOCALZIATION NOTE (command.*):
 #   These are the help messages for each command, the %S is the command name
@@ -74,12 +74,12 @@ command.topic=%S [new topic]: Set this channel's 
topic.
 command.umode=%S (+|-)new mode: Set or unset a user mode.
 command.version=%S nick: Request the version of a user's client.
 command.voice=%S nick1[,nick2]*: Grant channel voice status to 
someone. You must be a channel operator to do this.
-command.whois2=%S [nick]: Get information on a user.
+command.whois2=%S [nick]: Ø§ÙØØµÙÙ Ø¹ÙÙ ÙØ¹ÙÙÙØ§Øª Ø¹Ù 
Ø§ÙÙØ³ØªØ®Ø¯Ù.
 
 # LOCALIZATION NOTE (message.*):
 #These are shown as system messages in the conversation.
 #%1$S is the nick and %2$S is the nick and host of the user who joined.
-message.join=%1$S [%2$S] entered the room.
+message.join=%1$S [%2$S] Ø¯Ø®Ù Ø§ÙØºØ±ÙØ©.
 message.rejoined=ÙÙØ¯ Ø¥ÙØªØÙØª Ø¨Ø§ÙØºØ±ÙØ©.
 #%1$S is the nick of who kicked you.
 #%2$S is message.kicked.reason, if a kick message was given.
@@ -110,7 +110,7 @@ message.quit=%1$S has left the room (Quit%2$S).
 message.quit2=: %S
 #%1$S is the nickname of the user that invited us, %2$S is the conversation
 #name.
-message.inviteReceived=%1$S has invited you to %2$S.
+message.inviteReceived=%1$S Ø¯Ø¹Ø§Ù Ø¥ÙÙ %2$S.
 #%1$S is the nickname of the invited user, %2$S is the conversation name
 #they were invited to.
 message.invited=%1$S was successfully invited to %2$S.
@@ -129,8 +129,8 @@ message.whoisEntry=\\ua0\\ua0\\ua0\\ua0%1$S: %2$S
 message.unknownNick=%S is an unknown nickname.
 #%1$S is the nickname of the user who changed the mode and %2$S is the new
 #channel key (password).
-message.channelKeyAdded=%1$S changed the channel password to %2$S.
-message.channelKeyRemoved=%S removed the channel password.
+message.channelKeyAdded=%1$S ØºÙØ± ÙÙÙØ© Ø³Ø± Ø§ÙÙÙØ§Ø© Ø¥ÙÙ %2$S.
+message.channelKeyRemoved=%S Ø£Ø²Ø§Ù ÙÙÙØ© Ø³Ø± Ø§ÙÙÙØ§Ø©.
 #This will be followed by a list of ban masks.
 message.banMasks=Users connected from the following locations are banned from 
%S:
 message.noBanMasks=ÙÙØ³ ÙÙØ§Ù Ø§ÙØ§ÙÙ ÙØØ¸ÙØ±Ø© Ù S%.
@@ -146,7 +146,7 @@ message.ping=Ping reply from %1$S in #2 millisecond.;Ping 
reply from %1$S in #2
 # LOCALIZATION NOTE (error.*):
 #These are shown as error messages in the conversation or server tab.
 #%S is the channel name.
-error.noChannel=There is no channel: %S.
+error.noChannel=ÙØ§ ØªÙØ¬Ø¯ ÙÙØ§Ø©: %S.
 error.tooManyChannels=Cannot join %S; you've joined too many channels.
 #%1$S is your new nick, %2$S is the kill message from the server.
 error.nickCollision=Nick already in use, changing nick to %1$S [%2$S].
@@ -157,11 +157,11 @@ error.mode.wrongUser=You cannot change modes for other 
users.
 #%S is the nickname or channel name that isn't available.
 error.noSuchNick=%S is not online.
 error.wasNoSuchNick=ÙÙ ÙÙÙ ÙÙØ§Ù Ø§Ø³Ù Ø´ÙØ±Ø© %S.
-error.noSuchChannel=There is no channel: %S.
-error.unavailable=%S is temporarily unavailable.
+error.noSuchChannel=ÙØ§ ØªÙØ¬Ø¯ ÙÙØ§Ø©: %S.
+error.unavailable=%S ØºÙØ± ÙØªÙÙØ± ÙØ¤ÙØªØ§.
 #%S is the channel name.
 error.channelBanned=ØªÙ ØØ¬Ø¨Ù ÙÙ %S.
-error.cannotSendToChannel=You cannot send messages to %S.
+error.cannotSendToChannel=ÙØ§ ÙÙÙÙÙ Ø¥Ø±Ø³Ø§Ù Ø±Ø³Ø§Ø¦Ù Ø¥ÙÙ %S.
 error.channelFull=Ø§ÙÙÙØ§Ø© %S ÙØªÙØ¦Ù
 error.inviteOnly=You must be invited to join %S.
 error.nonUniqueTarget=%S is not a unique user@host or shortname or you have 
tried to join too many channels at once.
@@

[tor-commits] [translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties

2016-09-22 Thread translation

commit a2110ddc34c1a9a0a7a566ff539fde3d52554a42
Author: Translation commit bot 
Date:   Thu Sep 22 18:47:37 2016 +

Update translations for tor-messenger-conversationsproperties
---
 ar/conversations.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ar/conversations.properties b/ar/conversations.properties
index bfdfaa3..649725d 100644
--- a/ar/conversations.properties
+++ b/ar/conversations.properties
@@ -41,11 +41,11 @@ autoReply=Ø±Ø¯-ØªÙÙØ§Ø¦Ù %S
 
 # LOCALIZATION NOTE (noTopic):
 # Displayed instead of the topic when no topic is set.
-noTopic=No topic message for this room.
+noTopic=ÙØ§ ÙÙØ¬Ø¯ ØØ§ÙÙØ§ Ø£Ù ÙÙØ¶ÙØ¹ ÙÙØ°Ù Ø§ÙØºØ±ÙØ©.
 
 # LOCALIZATION NOTE (topicSet):
 #  %1$S is the conversation name, %2$S is the topic.
-topicSet=The topic for %1$S is: %2$S.
+topicSet=ÙÙØ¶ÙØ¹ %1$S ÙÙ: %2$S.
 # LOCALIZATION NOTE (topicNotSet):
 #  %S is the conversation name.
 topicNotSet=ÙØ§ ÙÙØ¬Ø¯ ÙÙØ¶ÙØ¹ %S.

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

[tor-commits] [translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd

2016-09-22 Thread translation

commit 992eac92f0c85fdb2a79fa3815f647925ba91362
Author: Translation commit bot 
Date:   Thu Sep 22 18:47:48 2016 +

Update translations for tor-messenger-fingerdtd
---
 ar/finger.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ar/finger.dtd b/ar/finger.dtd
index cd77883..f9a2917 100644
--- a/ar/finger.dtd
+++ b/ar/finger.dtd
@@ -8,8 +8,8 @@
 
 
 
-
-
+
+
 
 
 
\ No newline at end of file

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

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2016-09-22 Thread translation

commit 57fd8c79ce77bfee92efa714f990e84091dc2c91
Author: Translation commit bot 
Date:   Thu Sep 22 18:47:04 2016 +

Update translations for torbutton-abouttorproperties
---
 ar/abouttor.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ar/abouttor.properties b/ar/abouttor.properties
index d607324..f86e0b3 100644
--- a/ar/abouttor.properties
+++ b/ar/abouttor.properties
@@ -2,19 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search securely with Startpage.
+aboutTor.searchSP.privacy=Ø§Ø¨ØØ« Ø¢ÙÙØ§ ÙØ¹ Startpage.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchSP.search.link=https://startpage.com/
 
-aboutTor.searchDDG.privacy=Search securely with DuckDuckGo.
+aboutTor.searchDDG.privacy=Ø§Ø¨ØØ« Ø¢ÙÙØ§ ÙØ¹ DuckDuckGo.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.searchDC.privacy=Search securely with Disconnect.me.
+aboutTor.searchDC.privacy=Ø§Ø¨ØØ« Ø¢ÙÙØ§ ÙØ¹ Disconnect.me.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.

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

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2016-09-22 Thread translation

commit 183c58ee3ab747a69839a3d3849542451675fa0a
Author: Translation commit bot 
Date:   Thu Sep 22 18:47:08 2016 +

Update translations for torbutton-abouttorproperties_completed
---
 ar/abouttor.properties | 21 +
 1 file changed, 21 insertions(+)

diff --git a/ar/abouttor.properties b/ar/abouttor.properties
new file mode 100644
index 000..f86e0b3
--- /dev/null
+++ b/ar/abouttor.properties
@@ -0,0 +1,21 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Ø§Ø¨ØØ« Ø¢ÙÙØ§ ÙØ¹ Startpage.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Ø§Ø¨ØØ« Ø¢ÙÙØ§ ÙØ¹ DuckDuckGo.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.searchDC.privacy=Ø§Ø¨ØØ« Ø¢ÙÙØ§ ÙØ¹ Disconnect.me.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/

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

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2016-09-22 Thread translation

commit 8e63e4b711594adee4b4112fd57aabaa84332abd
Author: Translation commit bot 
Date:   Thu Sep 22 18:46:36 2016 +

Update translations for torbutton-torbuttondtd
---
 ar/torbutton.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ar/torbutton.dtd b/ar/torbutton.dtd
index fbf5e4c..b1c1247 100644
--- a/ar/torbutton.dtd
+++ b/ar/torbutton.dtd
@@ -44,18 +44,18 @@
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
-
+
 
 
 

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

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2016-09-22 Thread translation

commit 80af59adcf8cfbf6cfc225261948693909f933c1
Author: Translation commit bot 
Date:   Thu Sep 22 18:46:12 2016 +

Update translations for tails-misc
---
 ar.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ar.po b/ar.po
index 85fc8ae..7b88e1f 100644
--- a/ar.po
+++ b/ar.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 16:02+0200\n"
-"PO-Revision-Date: 2016-09-03 08:57+\n"
+"POT-Creation-Date: 2016-09-19 13:02+0200\n"
+"PO-Revision-Date: 2016-09-22 18:43+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\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/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2016-09-22 Thread translation

commit 5ffef90e16f5dbe467b4c3d68d722ff67a755f5d
Author: Translation commit bot 
Date:   Thu Sep 22 18:46:33 2016 +

Update translations for torbutton-torbuttonproperties
---
 ar/torbutton.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ar/torbutton.properties b/ar/torbutton.properties
index fd7e4b4..09f05a0 100644
--- a/ar/torbutton.properties
+++ b/ar/torbutton.properties
@@ -29,7 +29,7 @@ torbutton.popup.never_ask_again = ÙØ§ ØªØ³Ø£ÙÙÙ ÙØ±Ø© 
Ø§Ø®Ø±Ù
 torbutton.popup.confirm_newnym = ÙØªØµÙØ ØªÙØ±
 
 torbutton.slider_notification = The green onion menu now has a security slider 
which lets you adjust your security level. Check it out!
-torbutton.slider_notification_button = Open security settings
+torbutton.slider_notification_button = ÙØªØ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ£ÙØ§Ù
 
 torbutton.maximize_warning = ØªÙØ¨ÙØ± ÙØªØµÙØ ØªÙØ± ÙØ¯ ÙØ³ÙØ 
ÙØ¨Ø¹Ø¶ Ø§ÙÙÙØ§ÙØ¹ Ø¨Ø§ÙØªØ¹Ø±Ù Ø¹ÙÙ ØØ¬Ù Ø´Ø§Ø´ØªÙØ 
ÙØ§Ø³ØªØ®Ø¯Ø§Ù ÙØ°Ù Ø§ÙÙØ¹ÙÙÙØ§Øª ÙØªÙÙÙÙ. ÙÙØµÙ Ø¨Ø§Ø¨ÙØ§Ø¡ 
ÙØ§ÙØ°Ù ÙØªØµÙ ØªÙØ± Ø¹ÙÙ ØØ¬ÙÙØ§ Ø§ÙØ§ÙØªØ±Ø§Ø¶Ù.
 

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

[tor-commits] [translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties

2016-09-22 Thread translation

commit d6fd1b1a558a5d83ca91b168c9193214876d37f3
Author: Translation commit bot 
Date:   Thu Sep 22 18:17:32 2016 +

Update translations for tor-messenger-conversationsproperties
---
 ar/conversations.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ar/conversations.properties b/ar/conversations.properties
index fb77f21..bfdfaa3 100644
--- a/ar/conversations.properties
+++ b/ar/conversations.properties
@@ -51,7 +51,7 @@ topicSet=The topic for %1$S is: %2$S.
 topicNotSet=ÙØ§ ÙÙØ¬Ø¯ ÙÙØ¶ÙØ¹ %S.
 # LOCALIZATION NOTE (topicChanged):
 #  %1$S is the user who changed the topic, %2$S is the new topic.
-topicChanged=%1$S has changed the topic to: %2$S.
+topicChanged=%1$S Ø¨Ø¯Ù Ø§ÙÙÙØ¶ÙØ¹ Ø¥ÙÙ: %2$S.
 # LOCALIZATION NOTE (topicCleared):
 #  %1$S is the user who cleared the topic.
 topicCleared=%1$S has cleared the topic.

___
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

2016-09-22 Thread translation

commit 27ca0a4d6fbd6c2bd06305b81959d1b5ff815275
Author: Translation commit bot 
Date:   Thu Sep 22 18:15:26 2016 +

Update translations for https_everywhere_completed
---
 ar/https-everywhere.dtd | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/ar/https-everywhere.dtd b/ar/https-everywhere.dtd
index 0b0b79b..7cb8308 100644
--- a/ar/https-everywhere.dtd
+++ b/ar/https-everywhere.dtd
@@ -5,6 +5,7 @@
 
 
 
+
 
 
 
@@ -14,11 +15,12 @@
 
 
 
+
 
 
 
 
-
+
 
 
 
@@ -41,3 +43,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+

___
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

2016-09-22 Thread translation

commit 6cdb7627c0a6534954746281e5a81559203ade5d
Author: Translation commit bot 
Date:   Thu Sep 22 18:15:20 2016 +

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

diff --git a/ar/https-everywhere.dtd b/ar/https-everywhere.dtd
index 3c8605b..7cb8308 100644
--- a/ar/https-everywhere.dtd
+++ b/ar/https-everywhere.dtd
@@ -20,7 +20,7 @@
 
 
 
-
+
 
 
 
@@ -50,7 +50,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [torspec/master] Note TLS link key size and digest change in prop220

2016-09-22 Thread nickm

commit b2e42644dc39abe6c4960346fd588d8dcd0ab650
Author: Nick Mathewson 
Date:   Thu Sep 22 11:12:20 2016 -0400

Note TLS link key size and digest change in prop220
---
 proposals/220-ecc-id-keys.txt | 8 
 1 file changed, 8 insertions(+)

diff --git a/proposals/220-ecc-id-keys.txt b/proposals/220-ecc-id-keys.txt
index 7a21f20..dd063e8 100644
--- a/proposals/220-ecc-id-keys.txt
+++ b/proposals/220-ecc-id-keys.txt
@@ -670,3 +670,11 @@ A.5. Reserved numbers
 6: TLS authentication key certified by Ed25519 signing key
 7: RSA cross-certificate for Ed25519 identity key
 
+
+A.6. Related changes
+
+   As we merge this, proposal, we should also extend link key size to
+   2048 bits, and use SHA256 as the x509 cert algorithm for our link
+   keys. This will improve link security, and deliver better
+   fingerprinting resistence.  See proposal 179 for an older discussion
+   of this issue.

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

[tor-commits] [torspec/master] correct prop244 and make it more specific

2016-09-22 Thread nickm

commit 0760e80a360ad1d315b48099f3ebd5e511516b2d
Author: Nick Mathewson 
Date:   Thu Sep 22 11:02:40 2016 -0400

correct prop244 and make it more specific
---
 proposals/244-use-rfc5705-for-tls-binding.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/proposals/244-use-rfc5705-for-tls-binding.txt 
b/proposals/244-use-rfc5705-for-tls-binding.txt
index d1a51fe..c4369b3 100644
--- a/proposals/244-use-rfc5705-for-tls-binding.txt
+++ b/proposals/244-use-rfc5705-for-tls-binding.txt
@@ -21,7 +21,7 @@ Status: Accepted
   and TYPE field to be determined, that works the same as our current
   "RSA-SHA256-TLSSecret" authentication, except for these fields:
 
-TYPE is a different constant string.
+TYPE is a different constant string, "AUTH0002".
 
 TLSSECRETS is replaced by the output of the Exporter function in
 RFC5705, using as its inputs:
@@ -29,10 +29,10 @@ Status: Accepted
 * The context value equal to the client's identity key digest.
 * The length 32.
 
-  I propose that proposal 224's section on authenticating with ed25519
+  I propose that proposal 220's section on authenticating with ed25519
   keys be amended accordingly:
 
-TYPE is a different constant string, different from the one above.
+TYPE is a different constant string, "AUTH0003".
 
 TLSSECRETS is replaced by the output of the Exporter function in
 RFC5705, using as its inputs:

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

[tor-commits] [torspec/master] prop264: in consensuses, say "pr" rather than "proto"

2016-09-22 Thread nickm

commit d881250ff68a7bb77adef7a351790db7ee4c4332
Author: Nick Mathewson 
Date:   Thu Sep 22 10:27:13 2016 -0400

prop264: in consensuses, say "pr" rather than "proto"
---
 proposals/264-subprotocol-versions.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/proposals/264-subprotocol-versions.txt 
b/proposals/264-subprotocol-versions.txt
index 7f8c4d4..4acc8b3 100644
--- a/proposals/264-subprotocol-versions.txt
+++ b/proposals/264-subprotocol-versions.txt
@@ -72,7 +72,8 @@ Status: Open
"x-" or "X-".  Keywords are case-sensitive.
 
During voting, authorities copy these lines immediately below the "v"
-   lines. When a descriptor does not contain a "proto" entry, the
+   lines, using "pr" as the keyword instead of "proto".
+   When a descriptor does not contain a "proto" entry, the
authorities should reconstruct it using the approach described below
in section A.1.  They are included in the consensus using the same
rules as currently used for "v" lines, if a sufficiently late
@@ -104,7 +105,7 @@ Status: Open
inferrable from the v line.  Removing all the v lines from the
current consensus would save only 1.7% after gzip compression.]
 
-3. Using "proto" and "v" lines
+3. Using "proto"/"pr" and "v" lines
 
Whenever possible, clients and relays should use the list of
advertised protocols instead of version numbers.  Version numbers

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

[tor-commits] [bridgedb/master] Add support for bridge descriptors from multiple authorities.

2016-09-22 Thread isis

commit ae45f903f260fcc98997793c52919b2d9b289295
Author: Isis Lovecruft 
Date:   Tue Sep 6 18:33:33 2016 +

Add support for bridge descriptors from multiple authorities.

 * FIXES #20088: https://bugs.torproject.org/20088
---
 bridgedb.conf |   4 ++
 bridgedb/Main.py  | 172 +++---
 bridgedb/configure.py |   4 +-
 requirements.txt  |   2 +-
 4 files changed, 99 insertions(+), 83 deletions(-)

diff --git a/bridgedb.conf b/bridgedb.conf
index 52a8ca7..2d73a2b 100644
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@ -120,6 +120,10 @@
 # can read it.
 #--
 
+# List of directories which contain versions of the files specified in
+# BRIDGE_FILES, EXTRA_INFO_FILES, and STATUS_FILE.
+BRIDGE_AUTHORITY_DIRECTORIES = ["from-authority", "from-bifroest"]
+
 # List of filenames from which we read ``@type bridge-server-descriptor``s, on
 # startup and on SIGHUP.
 BRIDGE_FILES = ["bridge-descriptors"]
diff --git a/bridgedb/Main.py b/bridgedb/Main.py
index bf4c213..dc618cb 100644
--- a/bridgedb/Main.py
+++ b/bridgedb/Main.py
@@ -41,6 +41,12 @@ from bridgedb import Bridges
 from bridgedb.Stability import updateBridgeHistory
 
 
+def expandBridgeAuthDir(authdir, filename):
+"""Expands a descriptor ``filename`` relative to which of the
+BRIDGE_AUTHORITY_DIRECTORIES, ``authdir`` it resides within.
+"""
+return os.path.abspath(os.path.expanduser(os.sep.join([authdir, 
filename])))
+
 def load(state, hashring, clear=False):
 """Read and parse all descriptors, and load into a bridge hashring.
 
@@ -69,95 +75,101 @@ def load(state, hashring, clear=False):
 if ignoreNetworkstatus:
 logging.info("Ignoring BridgeAuthority networkstatus documents.")
 
-bridges = {}
-timestamps = {}
-
-logging.info("Opening networkstatus file: %s" % state.STATUS_FILE)
-networkstatuses = descriptors.parseNetworkStatusFile(state.STATUS_FILE)
-logging.debug("Closing networkstatus file: %s" % state.STATUS_FILE)
+for auth in state.BRIDGE_AUTHORITY_DIRECTORIES:
+logging.info("Processing descriptors in %s directory..." % auth)
 
-logging.info("Processing networkstatus descriptors...")
-for router in networkstatuses:
-bridge = Bridge()
-bridge.updateFromNetworkStatus(router, ignoreNetworkstatus)
-try:
-bridge.assertOK()
-except MalformedBridgeInfo as error:
-logging.warn(str(error))
-else:
-bridges[bridge.fingerprint] = bridge
+bridges = {}
+timestamps = {}
 
-for filename in state.BRIDGE_FILES:
-logging.info("Opening bridge-server-descriptor file: '%s'" % filename)
-serverdescriptors = descriptors.parseServerDescriptorsFile(filename)
-logging.debug("Closing bridge-server-descriptor file: '%s'" % filename)
+fn = expandBridgeAuthDir(auth, state.STATUS_FILE)
+logging.info("Opening networkstatus file: %s" % fn)
+networkstatuses = descriptors.parseNetworkStatusFile(fn)
+logging.debug("Closing networkstatus file: %s" % fn)
 
-for router in serverdescriptors:
+logging.info("Processing networkstatus descriptors...")
+for router in networkstatuses:
+bridge = Bridge()
+bridge.updateFromNetworkStatus(router, ignoreNetworkstatus)
 try:
-bridge = bridges[router.fingerprint]
-except KeyError:
-logging.warn(
-("Received server descriptor for bridge '%s' which wasn't "
- "in the networkstatus!") % router.fingerprint)
-if ignoreNetworkstatus:
-bridge = Bridge()
-else:
+bridge.assertOK()
+except MalformedBridgeInfo as error:
+logging.warn(str(error))
+else:
+bridges[bridge.fingerprint] = bridge
+
+for filename in state.BRIDGE_FILES:
+fn = expandBridgeAuthDir(auth, filename)
+logging.info("Opening bridge-server-descriptor file: '%s'" % fn)
+serverdescriptors = descriptors.parseServerDescriptorsFile(fn)
+logging.debug("Closing bridge-server-descriptor file: '%s'" % fn)
+
+for router in serverdescriptors:
+try:
+bridge = bridges[router.fingerprint]
+except KeyError:
+logging.warn(
+("Received server descriptor for bridge '%s' which 
wasn't "
+ "in the networkstatus!") % router.fingerprint)
+if ignoreNetworkstatus:
+bridge = Bridge()
+else:
+continue
+
+try:
+bridge.updateFromServerDescriptor(router, 
ignoreNetworkstatus)
+

[tor-commits] [bridgedb/develop] Create run/from-{authority, bifroest} directories during CI test runs.

2016-09-22 Thread isis

commit be7550e31fb2f76bca659319abc3b560ef472581
Author: Isis Lovecruft 
Date:   Thu Sep 8 17:52:15 2016 +

Create run/from-{authority,bifroest} directories during CI test runs.
---
 scripts/setup-tests | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/setup-tests b/scripts/setup-tests
index ec915d8..8e42762 100755
--- a/scripts/setup-tests
+++ b/scripts/setup-tests
@@ -11,7 +11,8 @@ THERE="$HERE"
 echo "Found top-level repo directory: $THERE"
 cd $THERE
 
-mkdir run
+mkdir -p run/from-authority
+mkdir -p run/from-bifroest
 cp -R -t run bridgedb.conf captchas .gnupg
 # Add '127.0.0.1' to EMAIL_DOMAINS in bridgedb.conf. This should ONLY be
 # done on testing servers, never on production servers.
@@ -25,6 +26,7 @@ sed -r -i -e "s/(HTTP_UNENCRYPTED_BIND_IP = 
)(None)/\1'127.0.0.1'/" run/bridgedb
 sed -r -i -e "s/(HTTP_UNENCRYPTED_PORT = )(None)/\16788/" run/bridgedb.conf
 sed -r -i -e "s/(SERVER_PUBLIC_FQDN = )(.*)/\1'127.0.0.1:6788'/" 
run/bridgedb.conf
 leekspin -n 100
-cp -t run networkstatus-bridges cached-extrainfo* bridge-descriptors
+cp -t run/from-authority networkstatus-bridges cached-extrainfo* 
bridge-descriptors
+cp -t run/from-bifroest networkstatus-bridges cached-extrainfo* 
bridge-descriptors
 ./scripts/make-ssl-cert
 cp -t run privkey.pem cert



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

[tor-commits] [bridgedb/develop] Add CHANGELOG entries for 0.3.8.

2016-09-22 Thread isis

commit 78e352ec18bc55bbb519747a1b1d9e909e3640d7
Author: Isis Lovecruft 
Date:   Thu Sep 22 12:06:44 2016 +

Add CHANGELOG entries for 0.3.8.
---
 CHANGELOG | 12 
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index d2fe18e..c0eb021 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,15 @@
+Changes in version 0.3.8 - 2016-09-22
+
+   * FIXES #20088 https://bugs.torproject.org/20088
+   BridgeDB now supports receiving descriptors from multiple Bridge
+   Authorities.  See also #19690.
+
+   * FIXES #20087 https://bugs.torproject.org/20087
+   BridgeDB's version of Stem now supports parsing transport lines in
+   bridge extrainfo descriptors which contain IPv6 addresses
+   contained within square brackets.
+
+
 Changes in version 0.3.7 - 2016-08-04
 
 * FIXES #19691 https://bugs.torproject.org



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

[tor-commits] [bridgedb/develop] Merge branch 'master' into develop

2016-09-22 Thread isis

commit a333183218e4239f2d7bebeb7a3a988bc4990a6c
Merge: 78e352e 9f753b3
Author: Isis Lovecruft 
Date:   Thu Sep 22 12:08:16 2016 +

Merge branch 'master' into develop

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

[tor-commits] [bridgedb/develop] Don't attempt to run coverage with PyPy.

2016-09-22 Thread isis

commit b98a543938ce552045a719adf130c93804ceb354
Author: Isis Lovecruft 
Date:   Thu Sep 8 17:45:53 2016 +

Don't attempt to run coverage with PyPy.
---
 Makefile | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/Makefile b/Makefile
index 6c20fee..8aa92a3 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,16 @@
 TRIAL:=$(shell which trial)
 VERSION:=$(shell git describe)
 
+define PYTHON_WHICH
+import platform
+import sys
+sys.stdout.write(platform.python_implementation())
+endef
+
+PYTHON_IMPLEMENTATION:=$(shell python -c '$(PYTHON_WHICH)')
+PYTHON_PYTHON=CPython
+PYTHON_PYPY=PyPy
+
 all: uninstall clean install coverage-test
 
 test:
@@ -59,8 +69,13 @@ clean: clean-docs clean-coverage-html
-rm -rf _trial_temp
 
 coverage-test:
+ifeq ($(PYTHON_IMPLEMENTATION),PyPy)
+   @echo "Detected PyPy... not running coverage."
+   python setup.py test
+else
coverage run --rcfile=".coveragerc" $(TRIAL) ./test/test_*.py
coverage report --rcfile=".coveragerc"
+endif
 
 coverage-html:
coverage html --rcfile=".coveragerc"



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

[tor-commits] [bridgedb/master] Don't attempt to run coverage with PyPy.

2016-09-22 Thread isis

commit b98a543938ce552045a719adf130c93804ceb354
Author: Isis Lovecruft 
Date:   Thu Sep 8 17:45:53 2016 +

Don't attempt to run coverage with PyPy.
---
 Makefile | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/Makefile b/Makefile
index 6c20fee..8aa92a3 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,16 @@
 TRIAL:=$(shell which trial)
 VERSION:=$(shell git describe)
 
+define PYTHON_WHICH
+import platform
+import sys
+sys.stdout.write(platform.python_implementation())
+endef
+
+PYTHON_IMPLEMENTATION:=$(shell python -c '$(PYTHON_WHICH)')
+PYTHON_PYTHON=CPython
+PYTHON_PYPY=PyPy
+
 all: uninstall clean install coverage-test
 
 test:
@@ -59,8 +69,13 @@ clean: clean-docs clean-coverage-html
-rm -rf _trial_temp
 
 coverage-test:
+ifeq ($(PYTHON_IMPLEMENTATION),PyPy)
+   @echo "Detected PyPy... not running coverage."
+   python setup.py test
+else
coverage run --rcfile=".coveragerc" $(TRIAL) ./test/test_*.py
coverage report --rcfile=".coveragerc"
+endif
 
 coverage-html:
coverage html --rcfile=".coveragerc"



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

[tor-commits] [bridgedb/master] Merge branch 'release/0.3.8'

2016-09-22 Thread isis

commit 9f753b3ccbd159bc3b906875b18a2b4c53aa8e91
Merge: f2fe8fb 78e352e
Author: Isis Lovecruft 
Date:   Thu Sep 22 12:07:28 2016 +

Merge branch 'release/0.3.8'

 .coveragerc  |   1 -
 .test.requirements.txt   |   2 +-
 .travis.requirements.txt |   4 +-
 CHANGELOG|  12 +++
 Makefile |  15 
 bridgedb.conf|   4 +
 bridgedb/Main.py | 172 +++
 bridgedb/configure.py|   4 +-
 requirements.txt |   4 +-
 scripts/install-dependencies |  12 ++-
 scripts/setup-tests  |   6 +-
 setup.py |   2 +-
 12 files changed, 146 insertions(+), 92 deletions(-)

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

[tor-commits] [bridgedb/master] Create run/from-{authority, bifroest} directories during CI test runs.

2016-09-22 Thread isis

commit be7550e31fb2f76bca659319abc3b560ef472581
Author: Isis Lovecruft 
Date:   Thu Sep 8 17:52:15 2016 +

Create run/from-{authority,bifroest} directories during CI test runs.
---
 scripts/setup-tests | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/setup-tests b/scripts/setup-tests
index ec915d8..8e42762 100755
--- a/scripts/setup-tests
+++ b/scripts/setup-tests
@@ -11,7 +11,8 @@ THERE="$HERE"
 echo "Found top-level repo directory: $THERE"
 cd $THERE
 
-mkdir run
+mkdir -p run/from-authority
+mkdir -p run/from-bifroest
 cp -R -t run bridgedb.conf captchas .gnupg
 # Add '127.0.0.1' to EMAIL_DOMAINS in bridgedb.conf. This should ONLY be
 # done on testing servers, never on production servers.
@@ -25,6 +26,7 @@ sed -r -i -e "s/(HTTP_UNENCRYPTED_BIND_IP = 
)(None)/\1'127.0.0.1'/" run/bridgedb
 sed -r -i -e "s/(HTTP_UNENCRYPTED_PORT = )(None)/\16788/" run/bridgedb.conf
 sed -r -i -e "s/(SERVER_PUBLIC_FQDN = )(.*)/\1'127.0.0.1:6788'/" 
run/bridgedb.conf
 leekspin -n 100
-cp -t run networkstatus-bridges cached-extrainfo* bridge-descriptors
+cp -t run/from-authority networkstatus-bridges cached-extrainfo* 
bridge-descriptors
+cp -t run/from-bifroest networkstatus-bridges cached-extrainfo* 
bridge-descriptors
 ./scripts/make-ssl-cert
 cp -t run privkey.pem cert



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

[tor-commits] [tor/master] Coverity warning fix: let coverity tell we're closing sockets

2016-09-22 Thread nickm

commit 0baa276ea9673ba1c7efce009d30a4afb4f63a6a
Author: Nick Mathewson 
Date:   Thu Sep 22 09:24:56 2016 -0400

Coverity warning fix: let coverity tell we're closing sockets

Our use of the (mockable) tor_close_socket() in the util/socket_..
tests confused coverity, which could no longer tell that we were
actually closing the sockets.
---
 src/test/test_util.c | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/test/test_util.c b/src/test/test_util.c
index 1edfaa9..d2152dd 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -5074,24 +5074,28 @@ test_util_socket(void *arg)
   tt_int_op(fd_is_nonblocking(fd4), OP_EQ, 1);
 #endif
 
-  tor_close_socket(fd1);
-  tor_close_socket(fd2);
+  tor_assert(tor_close_socket == tor_close_socket__real);
+
+  /* we use close_socket__real here so that coverity can tell that we are
+   * really closing these sockets. */
+  tor_close_socket__real(fd1);
+  tor_close_socket__real(fd2);
   fd1 = fd2 = TOR_INVALID_SOCKET;
   tt_int_op(get_n_open_sockets(), OP_EQ, n + 2);
-  tor_close_socket(fd3);
-  tor_close_socket(fd4);
+  tor_close_socket__real(fd3);
+  tor_close_socket__real(fd4);
   fd3 = fd4 = TOR_INVALID_SOCKET;
   tt_int_op(get_n_open_sockets(), OP_EQ, n);
 
  done:
   if (SOCKET_OK(fd1))
-tor_close_socket(fd1);
+tor_close_socket__real(fd1);
   if (SOCKET_OK(fd2))
-tor_close_socket(fd2);
+tor_close_socket__real(fd2);
   if (SOCKET_OK(fd3))
-tor_close_socket(fd3);
+tor_close_socket__real(fd3);
   if (SOCKET_OK(fd4))
-tor_close_socket(fd4);
+tor_close_socket__real(fd4);
 }
 
 static int

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

[tor-commits] [bridgedb/develop] Update stem to latest master.

2016-09-22 Thread isis

commit 73c9d3f4bea98245701bb951316881b45a39a874
Author: Isis Lovecruft 
Date:   Tue Sep 6 18:12:58 2016 +

Update stem to latest master.

This fixes an issue with stem not correctly parsing IPv6 addresses in
extrainfo transport lines, due to the surrounding brackets.

 * FIXES #20087: https://bugs.torproject.org/20087
---
 bridgedb.conf |   4 ++
 bridgedb/Main.py  | 173 +++---
 bridgedb/configure.py |   4 +-
 requirements.txt  |   2 +-
 4 files changed, 100 insertions(+), 83 deletions(-)

diff --git a/bridgedb.conf b/bridgedb.conf
index 52a8ca7..2d73a2b 100644
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@ -120,6 +120,10 @@
 # can read it.
 #--
 
+# List of directories which contain versions of the files specified in
+# BRIDGE_FILES, EXTRA_INFO_FILES, and STATUS_FILE.
+BRIDGE_AUTHORITY_DIRECTORIES = ["from-authority", "from-bifroest"]
+
 # List of filenames from which we read ``@type bridge-server-descriptor``s, on
 # startup and on SIGHUP.
 BRIDGE_FILES = ["bridge-descriptors"]
diff --git a/bridgedb/Main.py b/bridgedb/Main.py
index bf4c213..674b684 100644
--- a/bridgedb/Main.py
+++ b/bridgedb/Main.py
@@ -41,6 +41,12 @@ from bridgedb import Bridges
 from bridgedb.Stability import updateBridgeHistory
 
 
+def expandBridgeAuthDir(state, authdir, filename):
+"""Expands a descriptor ``filename`` relative to which of the
+BRIDGE_AUTHORITY_DIRECTORIES, ``authdir`` it resides within.
+"""
+return os.path.abspath(os.path.expanduser(os.sep.join([authdir, 
filename])))
+
 def load(state, hashring, clear=False):
 """Read and parse all descriptors, and load into a bridge hashring.
 
@@ -69,95 +75,102 @@ def load(state, hashring, clear=False):
 if ignoreNetworkstatus:
 logging.info("Ignoring BridgeAuthority networkstatus documents.")
 
-bridges = {}
-timestamps = {}
-
-logging.info("Opening networkstatus file: %s" % state.STATUS_FILE)
-networkstatuses = descriptors.parseNetworkStatusFile(state.STATUS_FILE)
-logging.debug("Closing networkstatus file: %s" % state.STATUS_FILE)
+for authdir in state.BRIDGE_AUTHORITY_DIRECTORIES:
+logging.info("Processing descriptors in %s directory..." % authdir)
 
-logging.info("Processing networkstatus descriptors...")
-for router in networkstatuses:
-bridge = Bridge()
-bridge.updateFromNetworkStatus(router, ignoreNetworkstatus)
-try:
-bridge.assertOK()
-except MalformedBridgeInfo as error:
-logging.warn(str(error))
-else:
-bridges[bridge.fingerprint] = bridge
+bridges = {}
+timestamps = {}
 
-for filename in state.BRIDGE_FILES:
-logging.info("Opening bridge-server-descriptor file: '%s'" % filename)
-serverdescriptors = descriptors.parseServerDescriptorsFile(filename)
-logging.debug("Closing bridge-server-descriptor file: '%s'" % filename)
+fn = expandBridgeAuthDir(state, authdir, state.STATUS_FILE)
+logging.info("Opening networkstatus file: %s" % fn)
+networkstatuses = descriptors.parseNetworkStatusFile(fn)
+logging.debug("Closing networkstatus file: %s" % fn)
 
-for router in serverdescriptors:
+logging.info("Processing networkstatus descriptors...")
+for router in networkstatuses:
+bridge = Bridge()
+bridge.updateFromNetworkStatus(router, ignoreNetworkstatus)
 try:
-bridge = bridges[router.fingerprint]
-except KeyError:
-logging.warn(
-("Received server descriptor for bridge '%s' which wasn't "
- "in the networkstatus!") % router.fingerprint)
-if ignoreNetworkstatus:
-bridge = Bridge()
-else:
+bridge.assertOK()
+except MalformedBridgeInfo as error:
+logging.warn(str(error))
+else:
+bridges[bridge.fingerprint] = bridge
+
+for filename in state.BRIDGE_FILES:
+fn = expandBridgeAuthDir(state, authdir, filename)
+logging.info("Opening bridge-server-descriptor file: '%s'" % fn)
+serverdescriptors = descriptors.parseServerDescriptorsFile(fn)
+logging.debug("Closing bridge-server-descriptor file: '%s'" % fn)
+
+for router in serverdescriptors:
+try:
+bridge = bridges[router.fingerprint]
+except KeyError:
+logging.warn(
+("Received server descriptor for bridge '%s' which 
wasn't "
+ "in the networkstatus!") % router.fingerprint)
+if ignoreNetworkstatus:
+bridge = Bridge()
+else:
+

[tor-commits] [bridgedb/develop] Upgrade coverage to version 4.2.

2016-09-22 Thread isis

commit 9634930606dbf1c07a5d9a370bf80b62b3631029
Author: Isis Lovecruft 
Date:   Thu Sep 8 16:51:56 2016 +

Upgrade coverage to version 4.2.
---
 .test.requirements.txt   | 2 +-
 .travis.requirements.txt | 2 +-
 setup.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.test.requirements.txt b/.test.requirements.txt
index bd4e741..f48bba3 100644
--- a/.test.requirements.txt
+++ b/.test.requirements.txt
@@ -5,7 +5,7 @@
 # $ pip install -r .test.requirements.txt
 # $ make coverage
 #
-coverage==3.7.1
+coverage==4.2
 leekspin==1.1.4
 mechanize==0.2.5
 pep8==1.5.7
diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index ebda8e0..c4f6966 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -13,7 +13,7 @@
 # $ make coverage
 #
 #--
-coverage==3.7.1
+coverage==4.2
 coveralls==0.4.2
 leekspin==1.1.4
 mechanize==0.2.5
diff --git a/setup.py b/setup.py
index 189d5b5..97dee01 100644
--- a/setup.py
+++ b/setup.py
@@ -381,7 +381,7 @@ setuptools.setup(
 scripts=['scripts/bridgedb',
  'scripts/get-tor-exits'],
 extras_require={'test': ["sure==1.2.2",
- "coverage==3.7.1",
+ "coverage==4.2",
  "leekspin==1.1.4"]},
 zip_safe=False,
 cmdclass=get_cmdclass(),



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

[tor-commits] [bridgedb/master] Merge branch 'fix/20087' into develop

2016-09-22 Thread isis

commit 121aaca2cb1b6db93fc5512d806cdc27fe303bd4
Merge: 09a62d4 73c9d3f
Author: Isis Lovecruft 
Date:   Thu Sep 8 23:49:39 2016 +

Merge branch 'fix/20087' into develop




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

[tor-commits] [bridgedb/master] Merge branch 'master' into develop

2016-09-22 Thread isis

commit 926a9899c1a1f18649838c857291d4e6daaff746
Merge: f1267fc f2fe8fb
Author: Isis Lovecruft 
Date:   Mon Aug 8 15:23:04 2016 +

Merge branch 'master' into develop




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

[tor-commits] [bridgedb/master] Coverage 4.2 doesn't understand [report] modules= config option.

2016-09-22 Thread isis

commit 0137fb5b202f3623fcc0a30a51e85230ab85e79a
Author: Isis Lovecruft 
Date:   Thu Sep 8 17:04:55 2016 +

Coverage 4.2 doesn't understand [report] modules= config option.
---
 .coveragerc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.coveragerc b/.coveragerc
index 04dc0a6..d16f7e2 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -5,7 +5,6 @@ branch = True
 timid = False
 
 [report]
-modules = bridgedb
 omit = 
  */_langs*
  */_version*



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

[tor-commits] [bridgedb/master] Update stem to latest master.

2016-09-22 Thread isis

commit 73c9d3f4bea98245701bb951316881b45a39a874
Author: Isis Lovecruft 
Date:   Tue Sep 6 18:12:58 2016 +

Update stem to latest master.

This fixes an issue with stem not correctly parsing IPv6 addresses in
extrainfo transport lines, due to the surrounding brackets.

 * FIXES #20087: https://bugs.torproject.org/20087
---
 bridgedb.conf |   4 ++
 bridgedb/Main.py  | 173 +++---
 bridgedb/configure.py |   4 +-
 requirements.txt  |   2 +-
 4 files changed, 100 insertions(+), 83 deletions(-)

diff --git a/bridgedb.conf b/bridgedb.conf
index 52a8ca7..2d73a2b 100644
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@ -120,6 +120,10 @@
 # can read it.
 #--
 
+# List of directories which contain versions of the files specified in
+# BRIDGE_FILES, EXTRA_INFO_FILES, and STATUS_FILE.
+BRIDGE_AUTHORITY_DIRECTORIES = ["from-authority", "from-bifroest"]
+
 # List of filenames from which we read ``@type bridge-server-descriptor``s, on
 # startup and on SIGHUP.
 BRIDGE_FILES = ["bridge-descriptors"]
diff --git a/bridgedb/Main.py b/bridgedb/Main.py
index bf4c213..674b684 100644
--- a/bridgedb/Main.py
+++ b/bridgedb/Main.py
@@ -41,6 +41,12 @@ from bridgedb import Bridges
 from bridgedb.Stability import updateBridgeHistory
 
 
+def expandBridgeAuthDir(state, authdir, filename):
+"""Expands a descriptor ``filename`` relative to which of the
+BRIDGE_AUTHORITY_DIRECTORIES, ``authdir`` it resides within.
+"""
+return os.path.abspath(os.path.expanduser(os.sep.join([authdir, 
filename])))
+
 def load(state, hashring, clear=False):
 """Read and parse all descriptors, and load into a bridge hashring.
 
@@ -69,95 +75,102 @@ def load(state, hashring, clear=False):
 if ignoreNetworkstatus:
 logging.info("Ignoring BridgeAuthority networkstatus documents.")
 
-bridges = {}
-timestamps = {}
-
-logging.info("Opening networkstatus file: %s" % state.STATUS_FILE)
-networkstatuses = descriptors.parseNetworkStatusFile(state.STATUS_FILE)
-logging.debug("Closing networkstatus file: %s" % state.STATUS_FILE)
+for authdir in state.BRIDGE_AUTHORITY_DIRECTORIES:
+logging.info("Processing descriptors in %s directory..." % authdir)
 
-logging.info("Processing networkstatus descriptors...")
-for router in networkstatuses:
-bridge = Bridge()
-bridge.updateFromNetworkStatus(router, ignoreNetworkstatus)
-try:
-bridge.assertOK()
-except MalformedBridgeInfo as error:
-logging.warn(str(error))
-else:
-bridges[bridge.fingerprint] = bridge
+bridges = {}
+timestamps = {}
 
-for filename in state.BRIDGE_FILES:
-logging.info("Opening bridge-server-descriptor file: '%s'" % filename)
-serverdescriptors = descriptors.parseServerDescriptorsFile(filename)
-logging.debug("Closing bridge-server-descriptor file: '%s'" % filename)
+fn = expandBridgeAuthDir(state, authdir, state.STATUS_FILE)
+logging.info("Opening networkstatus file: %s" % fn)
+networkstatuses = descriptors.parseNetworkStatusFile(fn)
+logging.debug("Closing networkstatus file: %s" % fn)
 
-for router in serverdescriptors:
+logging.info("Processing networkstatus descriptors...")
+for router in networkstatuses:
+bridge = Bridge()
+bridge.updateFromNetworkStatus(router, ignoreNetworkstatus)
 try:
-bridge = bridges[router.fingerprint]
-except KeyError:
-logging.warn(
-("Received server descriptor for bridge '%s' which wasn't "
- "in the networkstatus!") % router.fingerprint)
-if ignoreNetworkstatus:
-bridge = Bridge()
-else:
+bridge.assertOK()
+except MalformedBridgeInfo as error:
+logging.warn(str(error))
+else:
+bridges[bridge.fingerprint] = bridge
+
+for filename in state.BRIDGE_FILES:
+fn = expandBridgeAuthDir(state, authdir, filename)
+logging.info("Opening bridge-server-descriptor file: '%s'" % fn)
+serverdescriptors = descriptors.parseServerDescriptorsFile(fn)
+logging.debug("Closing bridge-server-descriptor file: '%s'" % fn)
+
+for router in serverdescriptors:
+try:
+bridge = bridges[router.fingerprint]
+except KeyError:
+logging.warn(
+("Received server descriptor for bridge '%s' which 
wasn't "
+ "in the networkstatus!") % router.fingerprint)
+if ignoreNetworkstatus:
+bridge = Bridge()
+else:
+

[tor-commits] [bridgedb/master] Add CHANGELOG entries for 0.3.8.

2016-09-22 Thread isis

commit 78e352ec18bc55bbb519747a1b1d9e909e3640d7
Author: Isis Lovecruft 
Date:   Thu Sep 22 12:06:44 2016 +

Add CHANGELOG entries for 0.3.8.
---
 CHANGELOG | 12 
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index d2fe18e..c0eb021 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,15 @@
+Changes in version 0.3.8 - 2016-09-22
+
+   * FIXES #20088 https://bugs.torproject.org/20088
+   BridgeDB now supports receiving descriptors from multiple Bridge
+   Authorities.  See also #19690.
+
+   * FIXES #20087 https://bugs.torproject.org/20087
+   BridgeDB's version of Stem now supports parsing transport lines in
+   bridge extrainfo descriptors which contain IPv6 addresses
+   contained within square brackets.
+
+
 Changes in version 0.3.7 - 2016-08-04
 
 * FIXES #19691 https://bugs.torproject.org



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

[tor-commits] [bridgedb/master] Merge branch 'fix/20088' into develop

2016-09-22 Thread isis

commit 09a62d48ce29e49235ca021dfb03838953eae0af
Merge: b98a543 be7550e
Author: Isis Lovecruft 
Date:   Thu Sep 8 22:27:14 2016 +

Merge branch 'fix/20088' into develop

 bridgedb.conf |   4 ++
 bridgedb/Main.py  | 172 +++---
 bridgedb/configure.py |   4 +-
 requirements.txt  |   2 +-
 scripts/setup-tests   |   6 +-
 5 files changed, 103 insertions(+), 85 deletions(-)



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

[tor-commits] [bridgedb/master] Upgrade coverage to version 4.2.

2016-09-22 Thread isis

commit 9634930606dbf1c07a5d9a370bf80b62b3631029
Author: Isis Lovecruft 
Date:   Thu Sep 8 16:51:56 2016 +

Upgrade coverage to version 4.2.
---
 .test.requirements.txt   | 2 +-
 .travis.requirements.txt | 2 +-
 setup.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.test.requirements.txt b/.test.requirements.txt
index bd4e741..f48bba3 100644
--- a/.test.requirements.txt
+++ b/.test.requirements.txt
@@ -5,7 +5,7 @@
 # $ pip install -r .test.requirements.txt
 # $ make coverage
 #
-coverage==3.7.1
+coverage==4.2
 leekspin==1.1.4
 mechanize==0.2.5
 pep8==1.5.7
diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index ebda8e0..c4f6966 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -13,7 +13,7 @@
 # $ make coverage
 #
 #--
-coverage==3.7.1
+coverage==4.2
 coveralls==0.4.2
 leekspin==1.1.4
 mechanize==0.2.5
diff --git a/setup.py b/setup.py
index 189d5b5..97dee01 100644
--- a/setup.py
+++ b/setup.py
@@ -381,7 +381,7 @@ setuptools.setup(
 scripts=['scripts/bridgedb',
  'scripts/get-tor-exits'],
 extras_require={'test': ["sure==1.2.2",
- "coverage==3.7.1",
+ "coverage==4.2",
  "leekspin==1.1.4"]},
 zip_safe=False,
 cmdclass=get_cmdclass(),



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

[tor-commits] [bridgedb/master] Use pip --no-binaries :all: for newer versions of pip.

2016-09-22 Thread isis

commit 09e6cb3577a06385f5350ba0d5187cb3914e01f3
Author: Isis Lovecruft 
Date:   Thu Sep 8 16:56:27 2016 +

Use pip --no-binaries :all: for newer versions of pip.
---
 scripts/install-dependencies | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/install-dependencies b/scripts/install-dependencies
index f9a3a15..189cf53 100755
--- a/scripts/install-dependencies
+++ b/scripts/install-dependencies
@@ -6,7 +6,17 @@ SUDO=
 APT_GET=$(which apt-get)
 APT_FLAGS='-q --no-install-suggests --no-install-recommends'
 PIP=$(which pip)
-PIP_FLAGS='--no-use-wheel'
+PIP_FLAGS=
+
+# If this doesn't work, then the version of pip is very old and we need to use 
--no-use-wheel
+$PIP --no-binaries :all:
+
+if test "$?" -eq 2 ; then
+PIP_FLAGS=$PIP_FLAGS' --no-use-wheel'
+else
+PIP_FLAGS=$PIP_FLAGS' --no-binaries :all:'
+fi
+
 DEPENDS="build-essential openssl sqlite3 python-dev python-setuptools"
 DEPENDS="${DEPENDS} libgeoip-dev geoip-database libjpeg-dev"
 HERE=$(dirname $0)



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

[tor-commits] [bridgedb/develop] Merge branch 'release/0.3.8'

2016-09-22 Thread isis

commit 9f753b3ccbd159bc3b906875b18a2b4c53aa8e91
Merge: f2fe8fb 78e352e
Author: Isis Lovecruft 
Date:   Thu Sep 22 12:07:28 2016 +

Merge branch 'release/0.3.8'

 .coveragerc  |   1 -
 .test.requirements.txt   |   2 +-
 .travis.requirements.txt |   4 +-
 CHANGELOG|  12 +++
 Makefile |  15 
 bridgedb.conf|   4 +
 bridgedb/Main.py | 172 +++
 bridgedb/configure.py|   4 +-
 requirements.txt |   4 +-
 scripts/install-dependencies |  12 ++-
 scripts/setup-tests  |   6 +-
 setup.py |   2 +-
 12 files changed, 146 insertions(+), 92 deletions(-)



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

[tor-commits] [bridgedb/master] Upgrade ipaddr to version 2.1.11.

2016-09-22 Thread isis

commit 835f25099ef2b761bf8b9fdfdc9e1c44de5585ee
Author: Isis Lovecruft 
Date:   Thu Sep 8 16:45:26 2016 +

Upgrade ipaddr to version 2.1.11.
---
 .travis.requirements.txt | 2 +-
 requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index c4f6966..0c1dc95 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -21,7 +21,7 @@ sure==1.2.2
 Babel==0.9.6
 BeautifulSoup==3.2.1
 Mako==0.8.1
-https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b077b19773d4f1b5f1ef88b26f6650ce0#egg=ipaddr-2.1.10-py2.7
+ipaddr==2.1.11
 pycrypto==2.6.1
 pygeoip==0.2.7
 gnupg==2.0.1
diff --git a/requirements.txt b/requirements.txt
index 4591511..bd25ae4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ Babel==0.9.6
 BeautifulSoup==3.2.1
 Mako==0.8.1
 Twisted==14.0.2
-https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b077b19773d4f1b5f1ef88b26f6650ce0#egg=ipaddr-2.1.10-py2.7
+ipaddr==2.1.11
 pycrypto==2.6.1
 pyOpenSSL==0.14
 pygeoip==0.2.7



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

[tor-commits] [bridgedb/develop] Use pip --no-binaries :all: for newer versions of pip.

2016-09-22 Thread isis

commit 09e6cb3577a06385f5350ba0d5187cb3914e01f3
Author: Isis Lovecruft 
Date:   Thu Sep 8 16:56:27 2016 +

Use pip --no-binaries :all: for newer versions of pip.
---
 scripts/install-dependencies | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/install-dependencies b/scripts/install-dependencies
index f9a3a15..189cf53 100755
--- a/scripts/install-dependencies
+++ b/scripts/install-dependencies
@@ -6,7 +6,17 @@ SUDO=
 APT_GET=$(which apt-get)
 APT_FLAGS='-q --no-install-suggests --no-install-recommends'
 PIP=$(which pip)
-PIP_FLAGS='--no-use-wheel'
+PIP_FLAGS=
+
+# If this doesn't work, then the version of pip is very old and we need to use 
--no-use-wheel
+$PIP --no-binaries :all:
+
+if test "$?" -eq 2 ; then
+PIP_FLAGS=$PIP_FLAGS' --no-use-wheel'
+else
+PIP_FLAGS=$PIP_FLAGS' --no-binaries :all:'
+fi
+
 DEPENDS="build-essential openssl sqlite3 python-dev python-setuptools"
 DEPENDS="${DEPENDS} libgeoip-dev geoip-database libjpeg-dev"
 HERE=$(dirname $0)



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

[tor-commits] [bridgedb/develop] Upgrade ipaddr to version 2.1.11.

2016-09-22 Thread isis

commit 835f25099ef2b761bf8b9fdfdc9e1c44de5585ee
Author: Isis Lovecruft 
Date:   Thu Sep 8 16:45:26 2016 +

Upgrade ipaddr to version 2.1.11.
---
 .travis.requirements.txt | 2 +-
 requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index c4f6966..0c1dc95 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -21,7 +21,7 @@ sure==1.2.2
 Babel==0.9.6
 BeautifulSoup==3.2.1
 Mako==0.8.1
-https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b077b19773d4f1b5f1ef88b26f6650ce0#egg=ipaddr-2.1.10-py2.7
+ipaddr==2.1.11
 pycrypto==2.6.1
 pygeoip==0.2.7
 gnupg==2.0.1
diff --git a/requirements.txt b/requirements.txt
index 4591511..bd25ae4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ Babel==0.9.6
 BeautifulSoup==3.2.1
 Mako==0.8.1
 Twisted==14.0.2
-https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b077b19773d4f1b5f1ef88b26f6650ce0#egg=ipaddr-2.1.10-py2.7
+ipaddr==2.1.11
 pycrypto==2.6.1
 pyOpenSSL==0.14
 pygeoip==0.2.7



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

[tor-commits] [bridgedb/develop] Merge branch 'fix/20087' into develop

2016-09-22 Thread isis

commit 121aaca2cb1b6db93fc5512d806cdc27fe303bd4
Merge: 09a62d4 73c9d3f
Author: Isis Lovecruft 
Date:   Thu Sep 8 23:49:39 2016 +

Merge branch 'fix/20087' into develop




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

[tor-commits] [bridgedb/develop] Merge branch 'fix/20088' into develop

2016-09-22 Thread isis

commit 09a62d48ce29e49235ca021dfb03838953eae0af
Merge: b98a543 be7550e
Author: Isis Lovecruft 
Date:   Thu Sep 8 22:27:14 2016 +

Merge branch 'fix/20088' into develop

 bridgedb.conf |   4 ++
 bridgedb/Main.py  | 172 +++---
 bridgedb/configure.py |   4 +-
 requirements.txt  |   2 +-
 scripts/setup-tests   |   6 +-
 5 files changed, 103 insertions(+), 85 deletions(-)



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

[tor-commits] [bridgedb/develop] Coverage 4.2 doesn't understand [report] modules= config option.

2016-09-22 Thread isis

commit 0137fb5b202f3623fcc0a30a51e85230ab85e79a
Author: Isis Lovecruft 
Date:   Thu Sep 8 17:04:55 2016 +

Coverage 4.2 doesn't understand [report] modules= config option.
---
 .coveragerc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.coveragerc b/.coveragerc
index 04dc0a6..d16f7e2 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -5,7 +5,6 @@ branch = True
 timid = False
 
 [report]
-modules = bridgedb
 omit = 
  */_langs*
  */_version*



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

[tor-commits] [bridgedb/develop] Add support for bridge descriptors from multiple authorities.

2016-09-22 Thread isis

commit ae45f903f260fcc98997793c52919b2d9b289295
Author: Isis Lovecruft 
Date:   Tue Sep 6 18:33:33 2016 +

Add support for bridge descriptors from multiple authorities.

 * FIXES #20088: https://bugs.torproject.org/20088
---
 bridgedb.conf |   4 ++
 bridgedb/Main.py  | 172 +++---
 bridgedb/configure.py |   4 +-
 requirements.txt  |   2 +-
 4 files changed, 99 insertions(+), 83 deletions(-)

diff --git a/bridgedb.conf b/bridgedb.conf
index 52a8ca7..2d73a2b 100644
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@ -120,6 +120,10 @@
 # can read it.
 #--
 
+# List of directories which contain versions of the files specified in
+# BRIDGE_FILES, EXTRA_INFO_FILES, and STATUS_FILE.
+BRIDGE_AUTHORITY_DIRECTORIES = ["from-authority", "from-bifroest"]
+
 # List of filenames from which we read ``@type bridge-server-descriptor``s, on
 # startup and on SIGHUP.
 BRIDGE_FILES = ["bridge-descriptors"]
diff --git a/bridgedb/Main.py b/bridgedb/Main.py
index bf4c213..dc618cb 100644
--- a/bridgedb/Main.py
+++ b/bridgedb/Main.py
@@ -41,6 +41,12 @@ from bridgedb import Bridges
 from bridgedb.Stability import updateBridgeHistory
 
 
+def expandBridgeAuthDir(authdir, filename):
+"""Expands a descriptor ``filename`` relative to which of the
+BRIDGE_AUTHORITY_DIRECTORIES, ``authdir`` it resides within.
+"""
+return os.path.abspath(os.path.expanduser(os.sep.join([authdir, 
filename])))
+
 def load(state, hashring, clear=False):
 """Read and parse all descriptors, and load into a bridge hashring.
 
@@ -69,95 +75,101 @@ def load(state, hashring, clear=False):
 if ignoreNetworkstatus:
 logging.info("Ignoring BridgeAuthority networkstatus documents.")
 
-bridges = {}
-timestamps = {}
-
-logging.info("Opening networkstatus file: %s" % state.STATUS_FILE)
-networkstatuses = descriptors.parseNetworkStatusFile(state.STATUS_FILE)
-logging.debug("Closing networkstatus file: %s" % state.STATUS_FILE)
+for auth in state.BRIDGE_AUTHORITY_DIRECTORIES:
+logging.info("Processing descriptors in %s directory..." % auth)
 
-logging.info("Processing networkstatus descriptors...")
-for router in networkstatuses:
-bridge = Bridge()
-bridge.updateFromNetworkStatus(router, ignoreNetworkstatus)
-try:
-bridge.assertOK()
-except MalformedBridgeInfo as error:
-logging.warn(str(error))
-else:
-bridges[bridge.fingerprint] = bridge
+bridges = {}
+timestamps = {}
 
-for filename in state.BRIDGE_FILES:
-logging.info("Opening bridge-server-descriptor file: '%s'" % filename)
-serverdescriptors = descriptors.parseServerDescriptorsFile(filename)
-logging.debug("Closing bridge-server-descriptor file: '%s'" % filename)
+fn = expandBridgeAuthDir(auth, state.STATUS_FILE)
+logging.info("Opening networkstatus file: %s" % fn)
+networkstatuses = descriptors.parseNetworkStatusFile(fn)
+logging.debug("Closing networkstatus file: %s" % fn)
 
-for router in serverdescriptors:
+logging.info("Processing networkstatus descriptors...")
+for router in networkstatuses:
+bridge = Bridge()
+bridge.updateFromNetworkStatus(router, ignoreNetworkstatus)
 try:
-bridge = bridges[router.fingerprint]
-except KeyError:
-logging.warn(
-("Received server descriptor for bridge '%s' which wasn't "
- "in the networkstatus!") % router.fingerprint)
-if ignoreNetworkstatus:
-bridge = Bridge()
-else:
+bridge.assertOK()
+except MalformedBridgeInfo as error:
+logging.warn(str(error))
+else:
+bridges[bridge.fingerprint] = bridge
+
+for filename in state.BRIDGE_FILES:
+fn = expandBridgeAuthDir(auth, filename)
+logging.info("Opening bridge-server-descriptor file: '%s'" % fn)
+serverdescriptors = descriptors.parseServerDescriptorsFile(fn)
+logging.debug("Closing bridge-server-descriptor file: '%s'" % fn)
+
+for router in serverdescriptors:
+try:
+bridge = bridges[router.fingerprint]
+except KeyError:
+logging.warn(
+("Received server descriptor for bridge '%s' which 
wasn't "
+ "in the networkstatus!") % router.fingerprint)
+if ignoreNetworkstatus:
+bridge = Bridge()
+else:
+continue
+
+try:
+bridge.updateFromServerDescriptor(router, 
ignoreNetworkstatus)
+

[tor-commits] [tor/master] Fix lintchanges warnings in 028

2016-09-22 Thread nickm

commit 1edea87c2ac66d9d9ba5c92e6b2e4baddb6bd886
Author: Nick Mathewson 
Date:   Thu Sep 22 09:00:16 2016 -0400

Fix lintchanges warnings in 028
---
 changes/bug20103| 2 +-
 changes/geoip-september2016 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changes/bug20103 b/changes/bug20103
index c2b81d3..bf0aeec 100644
--- a/changes/bug20103
+++ b/changes/bug20103
@@ -1,4 +1,4 @@
-  o Major bug fixes (crash):
+  o Major bugfixes (crash):
 
 - Fix a complicated crash bug that could affect Tor clients
   configured to use bridges when replacing a networkstatus consensus
diff --git a/changes/geoip-september2016 b/changes/geoip-september2016
index a14c7c6..1bf5570 100644
--- a/changes/geoip-september2016
+++ b/changes/geoip-september2016
@@ -1,4 +1,4 @@
-  o Minor features:
+  o Minor features (geoip):
 - Update geoip and geoip6 to the September 6 2016 Maxmind GeoLite2
   Country database.
 



___
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 'maint-0.2.8'

2016-09-22 Thread nickm

commit 6deeedb5e09fc0998ab5d4e2fc53415bc6dc5c39
Merge: 4c69ba5 1edea87
Author: Nick Mathewson 
Date:   Thu Sep 22 09:00:37 2016 -0400

Merge branch 'maint-0.2.8'

 changes/bug20103| 2 +-
 changes/geoip-september2016 | 2 +-
 2 files 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.8] Fix lintchanges warnings in 028

2016-09-22 Thread nickm

commit 1edea87c2ac66d9d9ba5c92e6b2e4baddb6bd886
Author: Nick Mathewson 
Date:   Thu Sep 22 09:00:16 2016 -0400

Fix lintchanges warnings in 028
---
 changes/bug20103| 2 +-
 changes/geoip-september2016 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changes/bug20103 b/changes/bug20103
index c2b81d3..bf0aeec 100644
--- a/changes/bug20103
+++ b/changes/bug20103
@@ -1,4 +1,4 @@
-  o Major bug fixes (crash):
+  o Major bugfixes (crash):
 
 - Fix a complicated crash bug that could affect Tor clients
   configured to use bridges when replacing a networkstatus consensus
diff --git a/changes/geoip-september2016 b/changes/geoip-september2016
index a14c7c6..1bf5570 100644
--- a/changes/geoip-september2016
+++ b/changes/geoip-september2016
@@ -1,4 +1,4 @@
-  o Minor features:
+  o Minor features (geoip):
 - Update geoip and geoip6 to the September 6 2016 Maxmind GeoLite2
   Country database.
 

___
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.8] Fix lintchanges warnings in 028

2016-09-22 Thread nickm

commit 1edea87c2ac66d9d9ba5c92e6b2e4baddb6bd886
Author: Nick Mathewson 
Date:   Thu Sep 22 09:00:16 2016 -0400

Fix lintchanges warnings in 028
---
 changes/bug20103| 2 +-
 changes/geoip-september2016 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changes/bug20103 b/changes/bug20103
index c2b81d3..bf0aeec 100644
--- a/changes/bug20103
+++ b/changes/bug20103
@@ -1,4 +1,4 @@
-  o Major bug fixes (crash):
+  o Major bugfixes (crash):
 
 - Fix a complicated crash bug that could affect Tor clients
   configured to use bridges when replacing a networkstatus consensus
diff --git a/changes/geoip-september2016 b/changes/geoip-september2016
index a14c7c6..1bf5570 100644
--- a/changes/geoip-september2016
+++ b/changes/geoip-september2016
@@ -1,4 +1,4 @@
-  o Minor features:
+  o Minor features (geoip):
 - Update geoip and geoip6 to the September 6 2016 Maxmind GeoLite2
   Country database.
 



___
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.8] Merge branch 'maint-0.2.8' into release-0.2.8

2016-09-22 Thread nickm

commit caa16bffc75b8e36ae3f834c52e9b107513e263f
Merge: a8b607b 1edea87
Author: Nick Mathewson 
Date:   Thu Sep 22 09:00:23 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug20103| 2 +-
 changes/geoip-september2016 | 2 +-
 2 files 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/master] Fix conflicting types errors for aes.c.

2016-09-22 Thread nickm

commit 4c69ba5895dd448001f80645d62b0d4497b61ac5
Author: Nick Mathewson 
Date:   Thu Sep 22 08:52:42 2016 -0400

Fix conflicting types errors for aes.c.
---
 src/common/aes.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/aes.c b/src/common/aes.c
index cb8fb68..ef94d8a 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -259,9 +259,9 @@ evaluate_ctr_for_aes(void)
 #define COUNTER(c, n) ((c)->counter ## n)
 #endif
 
-static void aes_set_key(aes_cnt_cipher_t *cipher, const char *key,
+static void aes_set_key(aes_cnt_cipher_t *cipher, const uint8_t *key,
 int key_bits);
-static void aes_set_iv(aes_cnt_cipher_t *cipher, const char *iv);
+static void aes_set_iv(aes_cnt_cipher_t *cipher, const uint8_t *iv);
 
 /**
  * Return a newly allocated counter-mode AES128 cipher implementation,

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

[tor-commits] [tor/master] Fix warnings from lintChanges.py

2016-09-22 Thread nickm

commit 20ce9f23dc89847dfc3b70ff1cc9f7ec5bd5d644
Author: Nick Mathewson 
Date:   Thu Sep 22 08:48:05 2016 -0400

Fix warnings from lintChanges.py
---
 changes/19122|  5 +++--
 changes/19977|  4 ++--
 changes/bug19677 |  6 +++---
 changes/bug19767 |  4 +++-
 changes/feature17178 | 14 +++---
 changes/reject-tap   |  4 +++-
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/changes/19122 b/changes/19122
index cface80..80f38a6 100644
--- a/changes/19122
+++ b/changes/19122
@@ -1,3 +1,4 @@
   o Minor bugfixes (documentation):
-- man page incorrectly states the User option takes a UID when it really
-  takes a username. Fixes bug 19122.
+- Fix manual for the User option: it takes a username, not a UID.
+  Fixes bug 19122; bugfix on 0.0.2pre16 (the first version to have
+  a manpage!).
diff --git a/changes/19977 b/changes/19977
index 0ca1af1..0e55fbd 100644
--- a/changes/19977
+++ b/changes/19977
@@ -1,6 +1,6 @@
-  o Minor bugfixes (unit test)
+  o Minor bugfixes (unit tests):
 - Fix shared random unit test that was failing on big endian architecture
   due to internal representation of a integer copied to a buffer. The test
   is changed to take a full 32 bytes of data and use the output of a
   python script that make the COMMIT and REVEAL calculation according to
-  the spec.  Fixes #19977; bugfix on tor-0.2.9.1-alpha.
+  the spec.  Fixes bug 19977; bugfix on tor-0.2.9.1-alpha.
diff --git a/changes/bug19677 b/changes/bug19677
index e8ba3dd..2c84b7e 100644
--- a/changes/bug19677
+++ b/changes/bug19677
@@ -1,6 +1,6 @@
-  o Minor bug fixes (option parsing):
+  o Minor bugfixes (option parsing):
 - Count unix sockets when counting client listeners (SOCKS, Trans,
   NATD, and DNS). This has no user-visible behaviour changes: these
   options are set once, and never read.
-  Required for correct behaviour in ticket #17178.
-  Fixes bug #19677, patch by teor.
+  Required for correct behaviour in ticket 17178.
+  Fixes bug 19677; bugfix on 0.2.6.3-alpha.  Patch by teor.
diff --git a/changes/bug19767 b/changes/bug19767
index f0a010b..a534922 100644
--- a/changes/bug19767
+++ b/changes/bug19767
@@ -1,4 +1,6 @@
   o Minor bugfixes (compilation):
 - Always include orconfig.h before including any other C headers.
   Sometimes, it includes macros that affect the behavior of the
-  standard headers. Closes bug 19767.
+  standard headers. Fixes bug 19767; bugfix on 0.2.9.1-alpha (the first
+  version to use AC_USE_SYSTEM_EXTENSIONS).
+
diff --git a/changes/feature17178 b/changes/feature17178
index 172097c..d6a8e8d 100644
--- a/changes/feature17178
+++ b/changes/feature17178
@@ -8,23 +8,23 @@
   This is compatible with the existing hidden service implementation, and
   works on the current tor network without any changes to older relays or
   clients.
-  Implements proposal #260, completes ticket #17178. Patch by teor & asn.
+  Implements proposal 260, completes ticket 17178. Patch by teor and asn.
   o Minor features (Tor2web):
 - Make Tor2web clients respect ReachableAddresses.
   This feature was inadvertently enabled in 0.2.8.6, then removed
-  by bugfix #19973 on 0.2.8.7.
-  Implements feature #20034. Patch by teor.
+  by bugfix 19973 on 0.2.8.7.
+  Implements feature 20034. Patch by teor.
   o Minor bug fixes (Tor2web):
 - Prevent Tor2web clients running hidden services, these services are
   not anonymous due to the one-hop client paths.
-  Fixes bug #19678. Patch by teor.
+  Fixes bug 19678. Patch by teor.
   o Minor bug fixes (circuits):
 - Use CircuitBuildTimeout whenever LearnCircuitBuildTimeout is disabled.
-  Fixes bug #19678 in commit 5b0b51ca3 in 0.2.4.12-alpha. Patch by teor.
+  Fixes bug 19678; bugfix on commit 5b0b51ca3 in 0.2.4.12-alpha. Patch by 
teor.
   o Minor bug fixes (options):
 - Stop changing the configured value of UseEntryGuards on authorities
   and Tor2web clients.
-  Fixes bug #20074 in commits 51fc6799 in tor-0.1.1.16-rc and
+  Fixes bug 20074; bugfix on commits 51fc6799 in tor-0.1.1.16-rc and
   acda1735 in tor-0.2.4.3-alpha. Patch by teor.
 - Check the consistency of UseEntryGuards and EntryNodes more reliably.
-  Fixes bug #20074 in commit 686aaa5c in tor-0.2.4.12-alpha. Patch by teor.
+  Fixes bug 20074; bugfix on commit 686aaa5c in tor-0.2.4.12-alpha. Patch 
by teor.
diff --git a/changes/reject-tap b/changes/reject-tap
index 8e616de..dad554f 100644
--- a/changes/reject-tap
+++ b/changes/reject-tap
@@ -1,4 +1,4 @@
-  o Major bug fixes (circuit building):
+  o Major features (circuit building, security):
 - Tor authorities, relays, and clients only use ntor, except for
   rare cases in the hidden service protocol.
 - Authorities, relays and clients specifically check that each
@@ -10,6 +10,8 @@
   mirrors, or

[tor-commits] [tor/master] fix crash in lintChanges.py

2016-09-22 Thread nickm

commit b64c22436216d92e2dc2d3754e121713e0a1f69f
Author: Nick Mathewson 
Date:   Thu Sep 22 08:33:09 2016 -0400

fix crash in lintChanges.py
---
 scripts/maint/lintChanges.py | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/maint/lintChanges.py b/scripts/maint/lintChanges.py
index 0b8c5e5..b63a4eb 100755
--- a/scripts/maint/lintChanges.py
+++ b/scripts/maint/lintChanges.py
@@ -55,7 +55,10 @@ def lintfile(fname):
'(' not in m.group(2)):
 warn("Missing subcategory on %s"%m.group(1))
 
-isBug = ("bug" in m.group(1).lower() or "fix" in m.group(1).lower())
+if m:
+isBug = ("bug" in m.group(1).lower() or "fix" in m.group(1).lower())
+else:
+isBug = False
 
 contents = " ".join(contents.split())
 

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

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2016-09-22 Thread translation

commit 276dc9df7f7e33256260fef1b35e28ce0d67958b
Author: Translation commit bot 
Date:   Thu Sep 22 08:45:54 2016 +

Update translations for tor-launcher-properties
---
 ar/torlauncher.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ar/torlauncher.properties b/ar/torlauncher.properties
index 27ae3e6..0b44b40 100644
--- a/ar/torlauncher.properties
+++ b/ar/torlauncher.properties
@@ -14,7 +14,7 @@ torlauncher.tor_bootstrap_failed_details=%1$S  ÙØ´Ù(%2$S).
 
 torlauncher.unable_to_start_tor=ØºÙØ± ÙØ§Ø¯Ø± Ø¹ÙÙ Ø¨Ø¯Ø¡ ØªØ´ØºÙÙ 
ØªÙØ±.\n\n%S
 torlauncher.tor_missing=Ø§ÙÙÙÙ Ø§ÙØªÙÙÙØ°Ù ÙØªÙØ± ÙÙÙÙØ¯.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.torrc_missing=Ø§ÙÙÙÙ torrc ÙÙÙÙØ¯ ÙÙÙ ÙØªÙ 
Ø¥ÙØ´Ø§Ø¤Ù. 
 torlauncher.datadir_missing=The Tor data directory does not exist and could 
not be created.
 torlauncher.password_hash_missing=ÙØ´Ù ÙÙ Ø§ÙØØµÙÙ Ø¹ÙÙ ÙÙÙØ© 
Ø§ÙÙØ±ÙØ± Ø§ÙÙØ¬Ø²Ø£Ø©.
 

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

80 matches

Mail list logo