[tor-commits] [bridgedb/develop] Change default Makefile directive.

2015-04-30 Thread isis 
commit 9b2a72469175d92cca13d6559918ba1b0a8c0749
Author: Isis Lovecruft 
Date:   Wed Apr 22 01:25:42 2015 +

Change default Makefile directive.

Conflicts:
Makefile
---
 Makefile |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c6c0442..2c09bbe 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,7 @@
 TRIAL:=$(shell which trial)
 VERSION:=$(shell git describe)
 
-all:
-   python setup.py build
+all: uninstall clean install coverage-test
 
 test:
python setup.py test

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

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

2015-04-30 Thread translation 
commit 1b686f52bfa01f6b6c90cdff97b5aceddd352641
Author: Translation commit bot 
Date:   Thu Apr 30 21:45:02 2015 +

Update translations for bridgedb
---
 sv/LC_MESSAGES/bridgedb.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 12e8451..6c3296b 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n"
-"PO-Revision-Date: 2015-04-30 12:41+\n"
+"PO-Revision-Date: 2015-04-30 21:24+\n"
 "Last-Translator: Peter Michanek \n"
 "Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"

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

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

2015-04-30 Thread translation 
commit 7cc8b418fd41b52139572e939317679633dfde1f
Author: Translation commit bot 
Date:   Thu Apr 30 21:45:08 2015 +

Update translations for bridgedb_completed
---
 sv/LC_MESSAGES/bridgedb.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 12e8451..6c3296b 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n"
-"PO-Revision-Date: 2015-04-30 12:41+\n"
+"PO-Revision-Date: 2015-04-30 21:24+\n"
 "Last-Translator: Peter Michanek \n"
 "Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\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] [webwml/master] Do not mention the phone on the website; it is being deprecated for now.

2015-04-30 Thread nickm 
commit 0296a1372fd0fb70655d4043a78746df461cda78
Author: Nick Mathewson 
Date:   Thu Apr 30 16:39:09 2015 -0400

Do not mention the phone on the website; it is being deprecated for now.
---
 about/en/contact.wml|4 ++--
 about/en/corepeople.wml |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/about/en/contact.wml b/about/en/contact.wml
index f2581bf..81477b1 100644
--- a/about/en/contact.wml
+++ b/about/en/contact.wml
@@ -97,13 +97,13 @@
 
 
 Telephone
-The Tor office is reachable at +1-781-948-1982. Please be aware that 
your
+Please be aware that your
 phone company and ours (and everyone in between) could listen to
 the call. Please do not call for technical support. Instead, email
 h...@rt.torproject.org. Technical support phone calls are not
 returned.
 
-For press inquiries, please call +1-617-902-0208.
+For press inquiries only, please call +1-617-902-0208.
 
 
 Mailing Address
diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index d914c23..6409372 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -224,7 +224,7 @@
   Manages the business operations of The Tor Project, Inc.
   Plays roles of finance, advocacy, project management, strategy,
   press, law enforcement liason, and victim of domestic violence
-  advocate. He can be contacted via and...@torproject.is or 
+1-781-948-1982.
+  advocate. He can be contacted via and...@torproject.is
 
   Dr. Karsten Loesing, Metrics Researcher and Developer
   Primary researcher and developer into

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

[tor-commits] [tor-browser-spec/master] Fixing typos and minor things

2015-04-30 Thread mikeperry 
commit 1bbff5085c226487cd2acc7d125d6cf7203c7493
Author: Georg Koppen 
Date:   Thu Apr 30 18:50:06 2015 +

Fixing typos and minor things
---
 design-doc/design.xml |   25 -
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/design-doc/design.xml b/design-doc/design.xml
index 7711d19..c0cb1b1 100644
--- a/design-doc/design.xml
+++ b/design-doc/design.xml
@@ -1184,8 +1184,7 @@ each cache key to include an additional ID that 
includes the URL bar
 domain. This functionality can be observed by navigating to about:cache and viewing the key used for each cache
 entry. Each third party element should have an additional "id=string"
-property prepended, which will list the FQDN that was used to source the third
-party element.
+property prepended, which will list the FQDN that was used to source it.
 
  
  
@@ -1200,12 +1199,12 @@ this cache per url bar domain.
 HTTP Auth
  
 
-HTTP Authorization headers can be used by Javascript to encode http://jeremiahgrossman.blogspot.com/2007/04/tracking-users-without-cookies.html";>silent
 third party tracking identifiers. To prevent this, we remove HTTP
 authentication tokens for third party elements through a https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-31.6.0esr-4.5-1&id=b8ce4a0760759431f146c71184c89fbd5e1a27e4";>patch
-to nsHTTPChannel. 
+to nsHTTPChannel.
 
  
 
@@ -1256,14 +1255,14 @@ 
url="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-31.6.0e
 to Firefox. To compensate for the increased round trip latency from 
disabling
 these performance optimizations, we also enable
 https://tools.ietf.org/html/draft-bmoeller-tls-falsestart-00";>TLS
-False Start via the Firefox Pref 
+False Start via the Firefox Pref
 security.ssl.enable_false_start.
 
 
-IP address, Tor Circuit, and HTTP Keep-Alive linkability
+IP address, Tor circuit, and HTTP Keep-Alive linkability
  
 
-IP addresses, Tor Circuits, and HTTP connections from a third party in one URL
+IP addresses, Tor circuits, and HTTP connections from a third party in one URL
 bar origin MUST NOT be reused for that same third party in another URL bar
 origin.
  
@@ -1271,14 +1270,14 @@ origin.
 
 This isolation functionality is provided by the combination of a https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-31.6.0esr-4.5-1&id=b3ea705cc35b79a9ba27323cb3e32d5d004ea113";>Firefox
-patch to allow SOCKS username and passwords, as well as a Torbutton
+patch to allow SOCKS usernames and passwords, as well as a Torbutton
 component that https://gitweb.torproject.org/torbutton.git/tree/src/components/domain-isolator.js";>sets
 the SOCKS username and password for each request. The Tor client has
 logic to prevent connections with different SOCKS usernames and passwords from
-using the same Tor Circuit, which provides us with IP address unlinkability.
-Firefox has existing logic to ensure that connections with SOCKS proxy do not
-re-use existing HTTP Keep Alive connections unless the proxy settings match.
+using the same Tor circuit, which provides us with IP address unlinkability.
+Firefox has existing logic to ensure that connections with SOCKS proxies do not
+re-use existing HTTP Keep-Alive connections unless the proxy settings match.
 We extended this logic to cover SOCKS username and password authentication,
 providing us with HTTP Keep-Alive unlinkability.
 
@@ -1325,7 +1324,7 @@ URIs created with URL.createObjectURL MUST be limited in 
scope to the first
 party URL bar domain that created them. We provide this isolation in Tor
 Browser via a https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-31.6.0esr-4.5-1&id=0d67ab406bdd3cf095802cb25c081641aa1f0bcc";>direct
-patch to Firefox.
+patch to Firefox and disable URL.createObjectURL in a worker context 
as a stopgap.
 
  
 
@@ -1487,7 +1486,7 @@ do so only on a per-site basis via site permissions, to 
avoid linkability.
  Device and Hardware Characteristics
   
 
-Device and hardware characteristics can be determined three ways: they can be
+Device and hardware characteristics can be determined in three ways: they can 
be
 reported explicitly by the browser, they can be inferred through API behavior,
 or they can be extracted through statistical measurements of system
 performance. We are most concerned with the cases where this information is

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

[tor-commits] [tor/master] reformat 0.2.7.1-alpha changelog

2015-04-30 Thread nickm 
commit 411049d0d44963b8d9ec6f96c8dc62a106d6cc30
Author: Nick Mathewson 
Date:   Thu Apr 30 15:30:20 2015 -0400

reformat 0.2.7.1-alpha changelog
---
 ChangeLog |  247 ++---
 1 file changed, 121 insertions(+), 126 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6a86744..250fb2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,67 +1,94 @@
 Changes in version 0.2.7.1-alpha - 2015-05-??
   Tor 0.2.7.1-alpha is the first alpha release in its series.
 
+  o New system requirements:
+- Tor no longer includes workarounds for Libevent versions before
+  1.3e. Libevent 2.0 or later is recommended. Closes ticket 15248.
+
   o Major features (controller):
 - Add the ADD_ONION and DEL_ONION commands that allows the creation
   and management of hidden services via the controller. Closes
   ticket 6411.
 - New "GETINFO onions/current" and "GETINFO onions/detached" to get
-  information about hidden services created via the controller.
-  Part of ticket 6411.
-- New HSFETCH command to launch a request for a hidden service descriptor.
-  Closes ticket 14847.
+  information about hidden services created via the controller. Part
+  of ticket 6411.
+- New HSFETCH command to launch a request for a hidden service
+  descriptor. Closes ticket 14847.
 
   o Major bugfixes (hidden services):
-- Revert commit that made directory authority assign the HSDir flag to
-  relay without a DirPort which is bad because relay can't handle
+- Revert commit that made directory authority assign the HSDir flag
+  to relay without a DirPort which is bad because relay can't handle
   BEGIN_DIR cells. Fixes bug 15850; bugfix on tor-0.2.6.3-alpha.
 
-  o Minor features (HS popularity countermeasure):
-- To avoid leaking HS popularity, don't cycle the introduction point
-  when we've handled a fixed number of INTRODUCE2 cells but instead
-  cycle it when a random value of introductions is reached thus making
-  it more difficult for an attacker to find out the amount of clients
-  that has passed through the introduction point for a specific HS.
-  Closes ticket 15745.
+  o Minor features (clock-jump tolerance):
+- Recover better when our clock jumps back many hours, like might
+  happen for Tails or Whonix users who start with a very wrong
+  hardware clock, use Tor to discover a more accurate time, and then
+  fix their clock. Resolves part of ticket 8766. [I'd call this a
+  major feature if it actually fixed all of the issues.]
 
   o Minor features (command-line interface):
-- Make --hash-password imply --hush to prevent unnecessary noise. Closes
-  ticket 15542.
+- Make --hash-password imply --hush to prevent unnecessary noise.
+  Closes ticket 15542.
+- Print a warning whenever we find a relative file path being used
+  as torrc option. Resolves issue 14018.
+- The "--hash-password" option now implies "--hush" to avoid
+  needless noise. Closes ticket 15542. Patch from "cypherpunks".
+
+  o Minor features (controller):
+- Controllers can now use GETINFO hs/client/desc/id/... to retrieve
+  items from the client's hidden service descriptor cache. Closes
+  ticket 14845.
 
-  o Minor features (controller)
-- Controllers can now use GETINFO hs/client/desc/id/... to
-  retrieve items from the client's hidden service descriptor
-  cache. Closes ticket 14845.
+  o Minor features (controller):
+- Add DirAuthority lines for default directory authorities to output
+  of the GETINFO config/defaults controller command if not already
+  present. Implements ticket 14840.
+- Implement a new controller command "status/fresh-relay-descs" to
+  fetch a descriptor/extrainfo pair that was generated on demand
+  just for the controller's use. Implements ticket 14784.
 
   o Minor features (DoS-resistance):
 - Make it harder for attackers to overwhelm hidden services with
   introductions, by blocking multiple introduction requests on the
   same circuit. Resolves ticket 15515.
 
+  o Minor features (geoip):
+- Update geoip to the April 8 2015 Maxmind GeoLite2 Country database.
+- Update geoip6 to the April 8 2015 Maxmind GeoLite2
+  Country database.
+
+  o Minor features (HS popularity countermeasure):
+- To avoid leaking HS popularity, don't cycle the introduction point
+  when we've handled a fixed number of INTRODUCE2 cells but instead
+  cycle it when a random value of introductions is reached thus
+  making it more difficult for an attacker to find out the amount of
+  clients that has passed through the introduction point for a
+  specific HS. Closes ticket 15745.
+
   o Minor features (logging):
 - Include the Tor version in all LD_BUG log messages, since people
   tend to cut and paste those into the bugtracker. Implements
   ticket 150

[tor-commits] [tor/master] Make lintChanges happy

2015-04-30 Thread nickm 
commit 174598f3ef95423bcc9d1614638a4cc9e7dd9f52
Author: Nick Mathewson 
Date:   Thu Apr 30 15:11:19 2015 -0400

Make lintChanges happy
---
 changes/bug-15771-reachability |2 +-
 changes/bug14391   |1 -
 changes/bug14806   |4 ++--
 changes/bug15269   |2 +-
 changes/bug15515   |2 +-
 changes/bug15850   |2 +-
 changes/deprecated-libevents   |2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/changes/bug-15771-reachability b/changes/bug-15771-reachability
index aff6268..0ca914f 100644
--- a/changes/bug-15771-reachability
+++ b/changes/bug-15771-reachability
@@ -4,5 +4,5 @@
   The previous fix used TestingTorNetwork, which implies
   ExtendAllowPrivateAddresses, but this excluded rare configs where
   ExtendAllowPrivateAddresses is set but TestingTorNetwork is not.
-  Fixes bug 15771; bugfix on 0.2.6.1-alpha, bug #13924.
+  Fixes bug 15771; bugfix on 0.2.6.1-alpha.
   Patch by "teor", issue discovered by CJ Ess.
diff --git a/changes/bug14391 b/changes/bug14391
index 5907372..2edd274 100644
--- a/changes/bug14391
+++ b/changes/bug14391
@@ -1,4 +1,3 @@
-
   o Code simplification and refactoring:
 - Refactor hidden service client-side cache lookup to intelligently
   report its various failure cases, and disentangle failure cases
diff --git a/changes/bug14806 b/changes/bug14806
index dd85e78..6a72145 100644
--- a/changes/bug14806
+++ b/changes/bug14806
@@ -1,3 +1,3 @@
-  o Minor bugfixes (testing):
-- Commandline argument tests moved to Stem. Fixes bug 14806.
+  o Minor features (testing):
+- Commandline argument tests moved to Stem. Resolves ticket 14806.
 
diff --git a/changes/bug15269 b/changes/bug15269
index e6b2b24..c511c6c 100644
--- a/changes/bug15269
+++ b/changes/bug15269
@@ -1,7 +1,7 @@
   o Minor bugfixes (logs):
 - When building Tor under Clang, do not include an extra set of
   parentheses in log messages that include function names.
-  Fixes bug 15053; bugfix on every released version of Tor when
+  Fixes bug 15269; bugfix on every released version of Tor when
   compiled with recent enough Clang.
 
 
diff --git a/changes/bug15515 b/changes/bug15515
index dda7c2f..93172d5 100644
--- a/changes/bug15515
+++ b/changes/bug15515
@@ -1,4 +1,4 @@
   o Minor features (DoS-resistance):
 - Make it harder for attackers to overwhelm hidden services with
   introductions, by blocking multiple introduction requests on the
-  same circuit. Resolves ticket #15515.
+  same circuit. Resolves ticket 15515.
diff --git a/changes/bug15850 b/changes/bug15850
index 48a7c7b..0d0a6e4 100644
--- a/changes/bug15850
+++ b/changes/bug15850
@@ -1,4 +1,4 @@
   o Major bugfix
 - Revert commit that made directory authority assign the HSDir flag to
   relay without a DirPort which is bad because relay can't handle
-  BEGIN_DIR cells. Fixes #15850. Bugfix on tor-0.2.6.3-alpha;
+  BEGIN_DIR cells. Fixes bug 15850; bugfix on tor-0.2.6.3-alpha.
diff --git a/changes/deprecated-libevents b/changes/deprecated-libevents
index 4ea0175..2eb6195 100644
--- a/changes/deprecated-libevents
+++ b/changes/deprecated-libevents
@@ -1,3 +1,3 @@
   o New system requirements:
 - Tor no longer includes workarounds for Libevent versions before 1.3e.
-  Libevent 2.0 or later is recommended. Closes ticket #15248.
+  Libevent 2.0 or later is recommended. Closes ticket 15248.



___
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 for already-moved things

2015-04-30 Thread nickm 
commit 16409449482686a6c650b28960b22135c54f287c
Author: Nick Mathewson 
Date:   Thu Apr 30 15:04:41 2015 -0400

remove changes files for already-moved things
---
 changes/bug11447 |5 -
 changes/bug15600 |5 -
 changes/bug15601 |4 
 3 files changed, 14 deletions(-)

diff --git a/changes/bug11447 b/changes/bug11447
deleted file mode 100644
index 8cd4f5b..000
--- a/changes/bug11447
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features (DoS-resistance):
-- Decrease the amount of reattempts that a hidden service is
-  willing to perform when its rendezvous circuits fail. This
-  reduces the computational cost for hidden service under heavy
-  load. Resolves ticket #11447.
\ No newline at end of file
diff --git a/changes/bug15600 b/changes/bug15600
deleted file mode 100644
index ee1d6cf..000
--- a/changes/bug15600
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (security, hidden service):
-- Fix an issue that would allow a malicious client to trigger
-  an assertion failure and halt a hidden service. Fixes
-  bug 15600; bugfix on 0.2.1.6-alpha. Reported by "skruffy".
-
diff --git a/changes/bug15601 b/changes/bug15601
deleted file mode 100644
index 2cc880a..000
--- a/changes/bug15601
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes (security, hidden service):
-- Fix a bug that could cause a client to crash with an assertion
-  failure when parsing a malformed hidden service descriptor.
-  Fixes bug 15601; bugfix on 0.2.1.5-alpha. Found by "DonnCha".



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

[tor-commits] [tor/master] Move changes entries into changelog for 0.2.7.1-alpha

2015-04-30 Thread nickm 
commit ef7ef4abb4f28d0d7615cd1bcae42c38f3c08e48
Author: Nick Mathewson 
Date:   Thu Apr 30 15:29:56 2015 -0400

Move changes entries into changelog for 0.2.7.1-alpha
---
 ChangeLog   |  225 ++-
 changes/15542   |3 -
 changes/bug-15642-default-fallback-default-dirs |   10 -
 changes/bug-15771-reachability  |8 -
 changes/bug13736|5 -
 changes/bug14018|4 -
 changes/bug14391|4 -
 changes/bug14784|4 -
 changes/bug14806|3 -
 changes/bug14922|3 -
 changes/bug14987b-doc   |4 -
 changes/bug14994|8 -
 changes/bug15053|4 -
 changes/bug15211|6 -
 changes/bug15269|7 -
 changes/bug15296|3 -
 changes/bug15515|4 -
 changes/bug15541|5 -
 changes/bug15546|4 -
 changes/bug15591|4 -
 changes/bug15604|7 -
 changes/bug15745|7 -
 changes/bug15759|6 -
 changes/bug15850|4 -
 changes/coverage|6 -
 changes/deprecated-libevents|3 -
 changes/doc15550|4 -
 changes/feature15026|5 -
 changes/feature15180|3 -
 changes/feature15344|3 -
 changes/feature15435|5 -
 changes/feature15471|5 -
 changes/feature15652|9 -
 changes/feature6411 |7 -
 changes/geoip-april2015 |3 -
 changes/geoip6-april2015|2 -
 changes/no_digests  |5 -
 changes/remove_old_version_checks   |5 -
 changes/test-memwipe|3 -
 changes/ticket14710 |   10 -
 changes/ticket14840 |5 -
 changes/ticket14845 |4 -
 changes/ticket14847 |3 -
 changes/ticket15024 |4 -
 changes/ticket15431 |6 -
 changes/ticket15542 |3 -
 changes/ticket8766  |7 -
 47 files changed, 224 insertions(+), 228 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 58cbec4..6a86744 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,227 @@
-Changes in version 0.2.7.1-alpha - 2015-0?-??
+Changes in version 0.2.7.1-alpha - 2015-05-??
+  Tor 0.2.7.1-alpha is the first alpha release in its series.
+
+  o Major features (controller):
+- Add the ADD_ONION and DEL_ONION commands that allows the creation
+  and management of hidden services via the controller. Closes
+  ticket 6411.
+- New "GETINFO onions/current" and "GETINFO onions/detached" to get
+  information about hidden services created via the controller.
+  Part of ticket 6411.
+- New HSFETCH command to launch a request for a hidden service descriptor.
+  Closes ticket 14847.
+
+  o Major bugfixes (hidden services):
+- Revert commit that made directory authority assign the HSDir flag to
+  relay without a DirPort which is bad because relay can't handle
+  BEGIN_DIR cells. Fixes bug 15850; bugfix on tor-0.2.6.3-alpha.
+
+  o Minor features (HS popularity countermeasure):
+- To avoid leaking HS popularity, don't cycle the introduction point
+  when we've handled a fixed number of INTRODUCE2 cells but instead
+  cycle it when a random value of introductions is reached thus making
+  it more difficult for an attacker to find out the amount of clients
+  that has passed through the introduction point for a specific HS.
+  Closes ticket 15745.
+
+  o Minor features (command-line interface):
+- Make --hash-password imply --hush to prevent unnecessary noise. Closes
+  ticket 15542.
+
+  o Minor features (controller)
+- Controllers can now use GETINFO hs/client/desc/id/... to
+  retrieve items from the client's hidden service descriptor
+  cache. Closes ticket 14845.
+
+  o Minor features (DoS-resistance):
+- Make it harder for attackers to overwhelm hidden services with
+  introductions, by blocking multiple introduction requests on the
+  same circuit. Resolves tick

[tor-commits] [tor/master] whitespace fixes

2015-04-30 Thread nickm 
commit e8814816c752846d72cf9a55c6f785f3c483e3e2
Author: Nick Mathewson 
Date:   Thu Apr 30 13:38:39 2015 -0400

whitespace fixes
---
 src/or/control.c|8 +++-
 src/or/rendclient.c |6 +++---
 src/or/rendcommon.c |7 ---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/or/control.c b/src/or/control.c
index 4578f2d..950e989 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3414,13 +3414,13 @@ handle_control_hsfetch(control_connection_t *conn, 
uint32_t len,
* always send a fetch command. */
   rend_client_fetch_v2_desc(rend_query, hsdirs);
 
-done:
+ done:
   SMARTLIST_FOREACH(args, char *, cp, tor_free(cp));
   smartlist_free(args);
   /* Contains data pointer that we don't own thus no cleanup. */
   smartlist_free(hsdirs);
   rend_data_free(rend_query);
-exit:
+ exit:
   return 0;
 }
 
@@ -5753,7 +5753,6 @@ node_describe_longname_by_id,(const char *id_digest))
   return longname;
 }
 
-
 /** Return either the onion address if the given pointer is a non empty
  * string else the unknown string. */
 static const char *
@@ -5773,11 +5772,10 @@ rend_hsaddress_str_or_unknown(const char *onion_address)
   /* All checks are good so return the given onion address. */
   str_ret = onion_address;
 
-end:
+ end:
   return str_ret;
 }
 
-
 /** send HS_DESC requested event.
  *
  * rend_query is used to fetch requested onion address and auth type.
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 834759c..d0c4b87 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -780,7 +780,7 @@ fetch_v2_desc_by_descid(const char *desc_id, const 
rend_data_t *rend_query,
   /* Everything went well. */
   ret = 0;
 
-end:
+ end:
   return ret;
 }
 
@@ -847,7 +847,7 @@ fetch_v2_desc_by_addr(rend_data_t *query, smartlist_t 
*hsdirs)
 "we already tried them all unsuccessfully.");
   ret = 0;
 
-end:
+ end:
   memwipe(descriptor_id, 0, sizeof(descriptor_id));
   return ret;
 }
@@ -877,7 +877,7 @@ rend_client_fetch_v2_desc(rend_data_t *query, smartlist_t 
*hsdirs)
 goto error;
   }
 
-error:
+ error:
   return ret;
 }
 
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 5fe00da..9384220 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -934,7 +934,7 @@ rend_valid_descriptor_id(const char *query)
 
   return 1;
 
-invalid:
+ invalid:
   return 0;
 }
 
@@ -1429,7 +1429,7 @@ compute_desc_id(rend_data_t *rend_data)
 }
   }
 
-end:
+ end:
   return ret;
 }
 
@@ -1498,7 +1498,8 @@ rend_data_client_create(const char *onion_address, const 
char *desc_id,
 
   return rend_data;
 
-error:
+ error:
   rend_data_free(rend_data);
   return NULL;
 }
+

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

[tor-commits] [tor/master] compilation fix: signed/unsigned comparison

2015-04-30 Thread nickm 
commit e9308a8341dd7b14720412b2b38b5809e79e3735
Author: Nick Mathewson 
Date:   Thu Apr 30 13:36:45 2015 -0400

compilation fix: signed/unsigned comparison
---
 src/or/rendcommon.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 1b042f9..5fe00da 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1411,7 +1411,8 @@ rend_data_dup(const rend_data_t *data)
 static int
 compute_desc_id(rend_data_t *rend_data)
 {
-  int ret, replica;
+  int ret;
+  unsigned replica;
   time_t now = time(NULL);
 
   tor_assert(rend_data);

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

[tor-commits] [tor/master] Update descriptor ID when it changes in rend_data

2015-04-30 Thread nickm 
commit a9b9f6d90f473e1a4fad3816ee73190da15b2291
Author: David Goulet 
Date:   Tue Apr 28 10:22:14 2015 -0400

Update descriptor ID when it changes in rend_data

When we have a new descriptor ID for an onion address request, change it in
the rend_data_t object and purge the old one from the last hid serv request
cache.

Signed-off-by: David Goulet 
---
 src/or/rendclient.c |   20 ++--
 src/or/rendclient.h |7 +++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 1ddaa8e..834759c 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -792,8 +792,7 @@ end:
  * On success, 1 is returned. If no hidden service is left to ask, return 0.
  * On error, -1 is returned. */
 static int
-fetch_v2_desc_by_addr(const rend_data_t *query,
-  smartlist_t *hsdirs)
+fetch_v2_desc_by_addr(rend_data_t *query, smartlist_t *hsdirs)
 {
   char descriptor_id[DIGEST_LEN];
   int replicas_left_to_try[REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS];
@@ -823,6 +822,16 @@ fetch_v2_desc_by_addr(const rend_data_t *query,
   goto end;
 }
 
+if (tor_memcmp(descriptor_id, query->descriptor_id[chosen_replica],
+   sizeof(descriptor_id)) != 0) {
+  /* Not equal from what we currently have so purge the last hid serv
+   * request cache and update the descriptor ID with the new value. */
+  purge_hid_serv_from_last_hid_serv_requests(
+query->descriptor_id[chosen_replica]);
+  memcpy(query->descriptor_id[chosen_replica], descriptor_id,
+ sizeof(query->descriptor_id[chosen_replica]));
+}
+
 /* Trigger the fetch with the computed descriptor ID. */
 ret = fetch_v2_desc_by_descid(descriptor_id, query, hsdirs);
 if (ret != 0) {
@@ -849,8 +858,7 @@ end:
  * On success, 1 is returned. If no hidden service is left to ask, return 0.
  * On error, -1 is returned. */
 int
-rend_client_fetch_v2_desc(const rend_data_t *query,
-  smartlist_t *hsdirs)
+rend_client_fetch_v2_desc(rend_data_t *query, smartlist_t *hsdirs)
 {
   int ret;
 
@@ -877,7 +885,7 @@ error:
  * one (possibly) working introduction point in it, start a connection to a
  * hidden service directory to fetch a v2 rendezvous service descriptor. */
 void
-rend_client_refetch_v2_renddesc(const rend_data_t *rend_query)
+rend_client_refetch_v2_renddesc(rend_data_t *rend_query)
 {
   int ret;
   rend_cache_entry_t *e = NULL;
@@ -964,7 +972,7 @@ rend_client_cancel_descriptor_fetches(void)
  */
 int
 rend_client_report_intro_point_failure(extend_info_t *failed_intro,
-   const rend_data_t *rend_query,
+   rend_data_t *rend_query,
unsigned int failure_type)
 {
   int i, r;
diff --git a/src/or/rendclient.h b/src/or/rendclient.h
index 5227b5c..639ec1e 100644
--- a/src/or/rendclient.h
+++ b/src/or/rendclient.h
@@ -19,9 +19,8 @@ void rend_client_rendcirc_has_opened(origin_circuit_t *circ);
 int rend_client_introduction_acked(origin_circuit_t *circ,
const uint8_t *request,
size_t request_len);
-void rend_client_refetch_v2_renddesc(const rend_data_t *rend_query);
-int rend_client_fetch_v2_desc(const rend_data_t *query,
-  smartlist_t *hsdirs);
+void rend_client_refetch_v2_renddesc(rend_data_t *rend_query);
+int rend_client_fetch_v2_desc(rend_data_t *query, smartlist_t *hsdirs);
 void rend_client_cancel_descriptor_fetches(void);
 void rend_client_purge_last_hid_serv_requests(void);
 
@@ -30,7 +29,7 @@ void rend_client_purge_last_hid_serv_requests(void);
 #define INTRO_POINT_FAILURE_UNREACHABLE 2
 
 int rend_client_report_intro_point_failure(extend_info_t *failed_intro,
-   const rend_data_t *rend_query,
+   rend_data_t *rend_query,
unsigned int failure_type);
 
 int rend_client_rendezvous_acked(origin_circuit_t *circ,



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

[tor-commits] [tor/master] Use descriptor ID when purging last hid fetch cache

2015-04-30 Thread nickm 
commit d33327ec22ac1ff2e25c337a12051efd2920cf3a
Author: David Goulet 
Date:   Mon Apr 27 16:21:47 2015 -0400

Use descriptor ID when purging last hid fetch cache

Stop using an onion address since it's not indexed with that anymore in the
last hid serv request cache. Instead use a base32 encoded descriptor ID
contained in the rend_data_t object.

Signed-off-by: David Goulet 
---
 src/or/circuituse.c  |2 +-
 src/or/connection_edge.c |3 +-
 src/or/rendclient.c  |   76 +++---
 src/or/rendclient.h  |2 +-
 4 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index d0d31ad..b54a4d2 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -2149,7 +2149,7 @@ link_apconn_to_circ(entry_connection_t *apconn, 
origin_circuit_t *circ,
  * that an attempt to connect to a hidden service just
  * succeeded.  Tell rendclient.c. */
 rend_client_note_connection_attempt_ended(
-ENTRY_TO_EDGE_CONN(apconn)->rend_data->onion_address);
+ENTRY_TO_EDGE_CONN(apconn)->rend_data);
   }
 
   if (cpath) { /* we were given one; use it */
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 4e1c7ca..cc6e3d7 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -102,8 +102,7 @@ connection_mark_unattached_ap_,(entry_connection_t *conn, 
int endreason,
* but we should fix it someday anyway. */
   if ((edge_conn->on_circuit != NULL || edge_conn->edge_has_sent_end) &&
   connection_edge_is_rendezvous_stream(edge_conn)) {
-rend_client_note_connection_attempt_ended(
-edge_conn->rend_data->onion_address);
+rend_client_note_connection_attempt_ended(edge_conn->rend_data);
   }
 
   if (base_conn->marked_for_close) {
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 8a8d8f7..1ddaa8e 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -474,9 +474,8 @@ rend_client_introduction_acked(origin_circuit_t *circ,
 
 /** Contains the last request times to hidden service directories for
  * certain queries; each key is a string consisting of the
- * concatenation of a base32-encoded HS directory identity digest, a
- * base32-encoded HS descriptor ID, and a hidden service address
- * (without the ".onion" part); each value is a pointer to a time_t
+ * concatenation of a base32-encoded HS directory identity digest and
+ * base32-encoded HS descriptor ID; each value is a pointer to a time_t
  * holding the time of the last request for that descriptor ID to that
  * HS directory. */
 static strmap_t *last_hid_serv_requests_ = NULL;
@@ -492,8 +491,7 @@ get_last_hid_serv_requests(void)
 }
 
 #define LAST_HID_SERV_REQUEST_KEY_LEN (REND_DESC_ID_V2_LEN_BASE32 + \
-   REND_DESC_ID_V2_LEN_BASE32 + \
-   REND_SERVICE_ID_LEN_BASE32)
+   REND_DESC_ID_V2_LEN_BASE32)
 
 /** Look up the last request time to hidden service directory hs_dir
  * for descriptor ID desc_id_base32. If set is non-zero,
@@ -554,20 +552,23 @@ directory_clean_last_hid_serv_requests(time_t now)
   }
 }
 
-/** Remove all requests related to the hidden service named
- * onion_address from the history of times of requests to
- * hidden service directories.
+/** Remove all requests related to the descriptor ID desc_id from the
+ * history of times of requests to hidden service directories.
+ * desc_id is an unencoded descriptor ID of size DIGEST_LEN.
  *
  * This is called from rend_client_note_connection_attempt_ended(), which
- * must be idempotent, so any future changes to this function must leave
- * it idempotent too.
- */
+ * must be idempotent, so any future changes to this function must leave it
+ * idempotent too. */
 static void
-purge_hid_serv_from_last_hid_serv_requests(const char *onion_address)
+purge_hid_serv_from_last_hid_serv_requests(const char *desc_id)
 {
   strmap_iter_t *iter;
   strmap_t *last_hid_serv_requests = get_last_hid_serv_requests();
-  /* XXX023 tor_assert(strlen(onion_address) == REND_SERVICE_ID_LEN_BASE32); */
+  char desc_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1];
+
+  /* Key is stored with the base32 encoded desc_id. */
+  base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_id,
+DIGEST_LEN);
   for (iter = strmap_iter_init(last_hid_serv_requests);
!strmap_iter_done(iter); ) {
 const char *key;
@@ -575,9 +576,9 @@ purge_hid_serv_from_last_hid_serv_requests(const char 
*onion_address)
 strmap_iter_get(iter, &key, &val);
 /* XXX023 tor_assert(strlen(key) == LAST_HID_SERV_REQUEST_KEY_LEN); */
 if (tor_memeq(key + LAST_HID_SERV_REQUEST_KEY_LEN -
-  REND_SERVICE_ID_LEN_BASE32,
-  onion_address,
-  REND_SERVICE_ID_LEN_BASE32)) {
+  REND_DESC_ID_V2_LEN_BASE32

[tor-commits] [tor/master] Merge branch 'bug15814_027_04'

2015-04-30 Thread nickm 
commit 41efe22c030e7c896ae5e1c380a3d783c03f0861
Merge: 26e0f86 a9b9f6d
Author: Nick Mathewson 
Date:   Thu Apr 30 13:32:52 2015 -0400

Merge branch 'bug15814_027_04'

 src/or/circuituse.c  |2 +-
 src/or/connection_edge.c |   37 -
 src/or/control.c |   28 ++---
 src/or/or.h  |   10 -
 src/or/rendclient.c  |  100 --
 src/or/rendclient.h  |9 ++---
 src/or/rendcommon.c  |   97 
 src/or/rendcommon.h  |8 
 src/or/rendservice.c |   19 -
 9 files changed, 218 insertions(+), 92 deletions(-)



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

[tor-commits] [tor/master] Use rend_data_client/service_create() in code

2015-04-30 Thread nickm 
commit 9a364026d314bfe76410318849e179dbd2e0b34d
Author: David Goulet 
Date:   Mon Apr 27 15:08:31 2015 -0400

Use rend_data_client/service_create() in code

Every callsite that use to allocate a rend_data_t object now use the
rend_data_client/service_create() function.

Signed-off-by: David Goulet 
---
 src/or/connection_edge.c |   34 ++
 src/or/control.c |   28 
 src/or/rendservice.c |   19 ---
 3 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 670905f..4e1c7ca 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1499,12 +1499,27 @@ 
connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
   return -1;
 }
 
+/* Look up if we have client authorization configured for this hidden
+ * service.  If we do, associate it with the rend_data. */
+rend_service_authorization_t *client_auth =
+  rend_client_lookup_service_authorization(socks->address);
+
+const char *cookie = NULL;
+rend_auth_type_t auth_type = REND_NO_AUTH;
+if (client_auth) {
+  log_info(LD_REND, "Using previously configured client authorization "
+   "for hidden service request.");
+  auth_type = client_auth->auth_type;
+  cookie = client_auth->descriptor_cookie;
+}
+
 /* Fill in the rend_data field so we can start doing a connection to
  * a hidden service. */
 rend_data_t *rend_data = ENTRY_TO_EDGE_CONN(conn)->rend_data =
-  tor_malloc_zero(sizeof(rend_data_t));
-strlcpy(rend_data->onion_address, socks->address,
-sizeof(rend_data->onion_address));
+  rend_data_client_create(socks->address, NULL, cookie, auth_type);
+if (rend_data == NULL) {
+  return -1;
+}
 log_info(LD_REND,"Got a hidden service request for ID '%s'",
  safe_str_client(rend_data->onion_address));
 
@@ -1547,19 +1562,6 @@ 
connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
   return 0;
 }
 
-/* Look up if we have client authorization configured for this hidden
- * service.  If we do, associate it with the rend_data. */
-rend_service_authorization_t *client_auth =
-  rend_client_lookup_service_authorization(
-  rend_data->onion_address);
-if (client_auth) {
-  log_info(LD_REND, "Using previously configured client authorization "
-"for hidden service request.");
-  memcpy(rend_data->descriptor_cookie,
- client_auth->descriptor_cookie, REND_DESC_COOKIE_LEN);
-  rend_data->auth_type = client_auth->auth_type;
-}
-
 /* We have the descriptor so launch a connection to the HS. */
 base_conn->state = AP_CONN_STATE_CIRCUIT_WAIT;
 log_info(LD_REND, "Descriptor is here. Great.");
diff --git a/src/or/control.c b/src/or/control.c
index 7c8a6c4..4578f2d 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3389,25 +3389,21 @@ handle_control_hsfetch(control_connection_t *conn, 
uint32_t len,
 }
   }
 
-  rend_query = tor_malloc_zero(sizeof(*rend_query));
-
-  if (hsaddress) {
-strncpy(rend_query->onion_address, hsaddress,
-sizeof(rend_query->onion_address));
-  } else if (desc_id) {
-/* Using a descriptor ID, we force the user to provide at least one
- * hsdir server using the SERVER= option. */
-if (!hsdirs || !smartlist_len(hsdirs)) {
+  rend_query = rend_data_client_create(hsaddress, desc_id, NULL,
+   REND_NO_AUTH);
+  if (rend_query == NULL) {
+connection_printf_to_buf(conn, "551 Error creating the HS query\r\n");
+goto done;
+  }
+
+  /* Using a descriptor ID, we force the user to provide at least one
+   * hsdir server using the SERVER= option. */
+  if (desc_id && (!hsdirs || !smartlist_len(hsdirs))) {
   connection_printf_to_buf(conn, "512 %s option is required\r\n",
opt_server);
   goto done;
-}
-memcpy(rend_query->descriptor_id, desc_id,
-   sizeof(rend_query->descriptor_id));
-  } else {
-/* We can't get in here because of the first argument check. */
-tor_assert(0);
   }
+
   /* We are about to trigger HSDir fetch so send the OK now because after
* that 650 event(s) are possible so better to have the 250 OK before them
* to avoid out of order replies. */
@@ -3423,7 +3419,7 @@ done:
   smartlist_free(args);
   /* Contains data pointer that we don't own thus no cleanup. */
   smartlist_free(hsdirs);
-  tor_free(rend_query);
+  rend_data_free(rend_query);
 exit:
   return 0;
 }
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index f257f6e..eb94202 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1735,13 +1735,11 @@ rend_service_introduce(origin_circuit_t *circuit, const 
uint8_t *request,
hexcookie, serviceid);
   t

[tor-commits] [tor/master] Add a create function for rend_data_t object

2015-04-30 Thread nickm 
commit e6a581f126bac80d1d0c61ae026d81076f03b77b
Author: David Goulet 
Date:   Tue Apr 28 11:01:58 2015 -0400

Add a create function for rend_data_t object

Ground works for fixing #15816. This adds the rend_data_create() function in
order to have a single place where we initialize that data structure.

Furthermore, an array of descriptor IDs is added (one per replica) so we can
keep a copy of the current id in the object. It will be used to purge the
last hid serv request cache using those descriptor IDs. When they change,
they will be replaced and the old ones will be purged from the cache.

Signed-off-by: David Goulet 
---
 src/or/or.h |   10 --
 src/or/rendclient.c |4 +--
 src/or/rendcommon.c |   97 +++
 src/or/rendcommon.h |8 +
 4 files changed, 115 insertions(+), 4 deletions(-)

diff --git a/src/or/or.h b/src/or/or.h
index dee1881..d9be1be 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -793,6 +793,11 @@ typedef struct rend_data_t {
   /** Onion address (without the .onion part) that a client requests. */
   char onion_address[REND_SERVICE_ID_LEN_BASE32+1];
 
+  /** Descriptor ID for each replicas computed from the onion address. If
+   * the onion address is empty, this array MUST be empty. We keep them so
+   * we know when to purge our entry in the last hsdir request table. */
+  char descriptor_id[REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS][DIGEST_LEN];
+
   /** (Optional) descriptor cookie that is used by a client. */
   char descriptor_cookie[REND_DESC_COOKIE_LEN];
 
@@ -800,8 +805,9 @@ typedef struct rend_data_t {
   rend_auth_type_t auth_type;
 
   /** Descriptor ID for a client request. The control port command HSFETCH
-   * can use this. */
-  char descriptor_id[DIGEST_LEN];
+   * uses this. It's set if the descriptor query should only use this
+   * descriptor ID. */
+  char desc_id_fetch[DIGEST_LEN];
 
   /** Hash of the hidden service's PK used by a service. */
   char rend_pk_digest[DIGEST_LEN];
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 13781c2..8a8d8f7 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -860,8 +860,8 @@ rend_client_fetch_v2_desc(const rend_data_t *query,
 
   if (query->onion_address[0] != '\0') {
 ret = fetch_v2_desc_by_addr(query, hsdirs);
-  } else if (query->descriptor_id[0] != '\0') {
-ret = fetch_v2_desc_by_descid(query->descriptor_id, query, hsdirs);
+  } else if (!tor_digest_is_zero(query->desc_id_fetch)) {
+ret = fetch_v2_desc_by_descid(query->desc_id_fetch, query, hsdirs);
   } else {
 /* Query data is invalid. */
 ret = -1;
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 03dd757..1b042f9 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1404,3 +1404,100 @@ rend_data_dup(const rend_data_t *data)
   return tor_memdup(data, sizeof(rend_data_t));
 }
 
+/** Compute descriptor ID for each replicas and save them. A valid onion
+ * address must be present in the rend_data.
+ *
+ * Return 0 on success else -1. */
+static int
+compute_desc_id(rend_data_t *rend_data)
+{
+  int ret, replica;
+  time_t now = time(NULL);
+
+  tor_assert(rend_data);
+
+  /* Compute descriptor ID for each replicas. */
+  for (replica = 0; replica < ARRAY_LENGTH(rend_data->descriptor_id);
+   replica++) {
+ret = rend_compute_v2_desc_id(rend_data->descriptor_id[replica],
+  rend_data->onion_address,
+  rend_data->descriptor_cookie,
+  now, replica);
+if (ret < 0) {
+  goto end;
+}
+  }
+
+end:
+  return ret;
+}
+
+/** Allocate and initialize a rend_data_t object for a service using the
+ * given arguments. Only the onion_address is not optional.
+ *
+ * Return a valid rend_data_t pointer. */
+rend_data_t *
+rend_data_service_create(const char *onion_address, const char *pk_digest,
+ const uint8_t *cookie, rend_auth_type_t auth_type)
+{
+  rend_data_t *rend_data = tor_malloc_zero(sizeof(*rend_data));
+
+  /* We need at least one else the call is wrong. */
+  tor_assert(onion_address != NULL);
+
+  if (pk_digest) {
+memcpy(rend_data->rend_pk_digest, pk_digest,
+   sizeof(rend_data->rend_pk_digest));
+  }
+  if (cookie) {
+memcpy(rend_data->rend_cookie, cookie,
+   sizeof(rend_data->rend_cookie));
+  }
+
+  strlcpy(rend_data->onion_address, onion_address,
+  sizeof(rend_data->onion_address));
+  rend_data->auth_type = auth_type;
+
+  return rend_data;
+}
+
+/** Allocate and initialize a rend_data_t object for a client request using
+ * the given arguments.  Either an onion address or a descriptor ID is
+ * needed. Both can be given but only the onion address will be used to make
+ * the descriptor fetch.
+ *
+ * Return a valid rend_data_t pointer or NULL on error meaning the
+ * descriptor IDs couldn't be computed from the given data. */
+rend_d

[tor-commits] [githax/master] add some licenses

2015-04-30 Thread nickm 
commit 4da01c4fb45e6c89366d2d1adcbbbcc06d7cce09
Author: Nick Mathewson 
Date:   Thu Apr 30 12:26:29 2015 -0400

add some licenses
---
 scripts/git-add-tor-remote |3 +++
 scripts/git-resquash.sh|3 +++
 2 files changed, 6 insertions(+)

diff --git a/scripts/git-add-tor-remote b/scripts/git-add-tor-remote
index b0c3856..096b040 100755
--- a/scripts/git-add-tor-remote
+++ b/scripts/git-add-tor-remote
@@ -1,4 +1,7 @@
 #!/usr/bin/python
+# Absolutely anybody receiving a copy of this script may do anything
+# with it that copyright law would otherwise restrict. There is no
+# warranty. -- Nick Mathewson, 2015.
 
 import os
 import sys
diff --git a/scripts/git-resquash.sh b/scripts/git-resquash.sh
index 87a53e5..79bde28 100755
--- a/scripts/git-resquash.sh
+++ b/scripts/git-resquash.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+# Absolutely anybody receiving a copy of this script may do anything
+# with it that copyright law would otherwise restrict. There is no
+# warranty. -- Nick Mathewson, 2015.
 
 PARENT="$1"
 

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

[tor-commits] [githax/master] Add a handy script to add a given user's remote repository.

2015-04-30 Thread nickm 
commit b0d83f16897d98c61436afaa9e3a194f3c524b72
Author: Nick Mathewson 
Date:   Thu Apr 30 12:24:41 2015 -0400

Add a handy script to add a given user's remote repository.
---
 scripts/git-add-tor-remote |  138 
 1 file changed, 138 insertions(+)

diff --git a/scripts/git-add-tor-remote b/scripts/git-add-tor-remote
new file mode 100755
index 000..b0c3856
--- /dev/null
+++ b/scripts/git-add-tor-remote
@@ -0,0 +1,138 @@
+#!/usr/bin/python
+
+import os
+import sys
+import subprocess
+
+OLD_NAMES_STR = """
+   arma/bridgedb
+   arma/tor
+   arma/tor-ideas
+   arma/torspec
+   arma/vidalia
+   atagar/arm
+   atagar/pytorctl
+   atagar/tor-utils
+   chiiph/vidalia
+   chrisd/polipo
+   erinn/build-scripts
+   erinn/thandy
+   erinn/tor
+   erinn/torbrowser
+   erinn/vidalia
+   hoganrobert/tor
+   hoganrobert/torsocks
+   ioerror/build-scripts
+   ioerror/filedump
+   ioerror/polipo
+   ioerror/tor
+   ioerror/tor-cloud
+   ioerror/tor-extra
+   ioerror/torsocks
+   ioerror/torwall
+   ioerror/ttdnsd
+   kaner/bridgedb
+   kaner/gettor
+   kaner/weather
+   karsten/bridgedb
+   karsten/metrics-db
+   karsten/metrics-tasks
+   karsten/metrics-utils
+   karsten/metrics-web
+   karsten/tor
+   karsten/tor-utils
+   karsten/torflow
+   karsten/torperf
+   linus/tor
+   linus/tor-extra
+   mikeperry/https-everywhere
+   mikeperry/pytorctl
+   mikeperry/tor
+   mikeperry/torbrowser
+   mikeperry/torbutton
+   mikeperry/torflow
+   mikeperry/torperf
+   mikeperry/weather
+   n8fr8/orbot
+   nickm/bridgedb
+   nickm/chutney
+   nickm/githax
+   nickm/obfsproxy
+   nickm/thandy
+   nickm/tor
+   nickm/tor-ideas
+   pde/https-everywhere
+   rransom/libeventbook
+   rransom/metrics-tasks
+   rransom/tor
+   rransom/tor-utils
+   rransom/torspec
+   runa/tor-cloud
+   runa/vidalia
+   schoen/https-everywhere
+   sebastian/arm
+   sebastian/bridgedb
+   sebastian/gettor
+   sebastian/githax
+   sebastian/jtorctl
+   sebastian/libevent
+   sebastian/libeventbook
+   sebastian/orbot
+   sebastian/puppetor
+   sebastian/thandy
+   sebastian/tor
+   sebastian/tor-utils
+   sebastian/torbel
+   sebastian/torbrowser
+   sebastian/torbutton
+   sebastian/torperf
+   sebastian/torspec
+   sebastian/vidalia
+   sjm217/build-scripts
+   sjm217/metrics
+   sjm217/pluggable-transport
+   sjm217/tor
+   sjm217/torbrowser
+   sjm217/torspec
+   tomb/torperf
+"""
+
+OLD_NAMES = set(OLD_NAMES_STR.split())
+
+def run():
+if len(sys.argv) != 3:
+print "SYNTAX: git-add-tor-remote username repo"
+sys.exit(1)
+
+_,cmd = os.path.split(sys.argv[0])
+if cmd == 'git-seturl-tor-remote':
+gitcmd = "set-url"
+else:
+gitcmd = "add"
+
+username, repo = sys.argv[1:]
+if not os.path.isdir(".git"):
+print "Hey, I'm not in a git repo!"
+sys.exit(1)
+
+_, mydir = os.path.split(os.getcwd())
+if mydir != repo and not mydir.startswith(repo):
+print "{0} doesn't look like a {1} repository".format(mydir,repo)
+sys.exit(1)
+
+reponame = "{username}/{repo}".format(**locals())
+if reponame in OLD_NAMES:
+#print "Old name exists for this repository"
+pass
+else:
+#print "No old name for this repository"
+reponame = "user/{username}/{repo}".format(**locals())
+
+fullname = "g...@git-rw.torproject.org:/{reponame}".format(**locals())
+
+cmdline = ["git", "remote", gitcmd, username, fullname]
+print " ".join(cmdline)
+subprocess.check_call(cmdline)
+
+if __name__ == '__main__':
+run()

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

[tor-commits] [tor/master] Add missing newline in memwipe test.

2015-04-30 Thread nickm 
commit 26e0f8635af62eef115452e31d55e3f40fe1e90d
Author: cypherpunks 
Date:   Fri Apr 24 10:19:22 2015 +0200

Add missing newline in memwipe test.
---
 src/test/test-memwipe.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 815475a..cd3900e 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -200,7 +200,7 @@ main(int argc, char **argv)
 printf("ERROR: memwipe does not wipe data!\n");
 return 1;
   } else {
-printf("OKAY: memwipe seems to work.");
+printf("OKAY: memwipe seems to work.\n");
 return 0;
   }
 }

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

[tor-commits] [tor-messenger-build/master] instantbird: remove fix-versionhelpers.h-include.mozpatch

2015-04-30 Thread boklm 
commit 4d716d9c2e81bf386f2a1a95ab293d0517c1b206
Author: Nicolas Vigier 
Date:   Thu Apr 30 17:44:05 2015 +0200

instantbird: remove fix-versionhelpers.h-include.mozpatch

Patch applied upstream.
---
 projects/instantbird/config|2 --
 .../fix-versionhelpers.h-include.mozpatch  |   36 
 2 files changed, 38 deletions(-)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index c9593c9..4fd4585 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -77,8 +77,6 @@ input_files:
   - filename: branding/default48.png
   - filename: fix-mingw-build.patch
 enable: '[% c("var/windows") %]'
-  - filename: fix-versionhelpers.h-include.mozpatch
-enable: '[% c("var/windows") %]'
   - filename: 'mozconfig-[% c("var/osname") %]'
 name: mozconfig
   - name: python
diff --git a/projects/instantbird/fix-versionhelpers.h-include.mozpatch 
b/projects/instantbird/fix-versionhelpers.h-include.mozpatch
deleted file mode 100644
index 860db81..000
--- a/projects/instantbird/fix-versionhelpers.h-include.mozpatch
+++ /dev/null
@@ -1,36 +0,0 @@
-From cba17f0febd0978adf15d4a6cf21b4fbcb979884 Mon Sep 17 00:00:00 2001
-From: Nicolas Vigier 
-Date: Fri, 24 Apr 2015 12:20:57 +0200
-Subject: [PATCH] Fix versionhelpers.h include
-

- media/gmp-clearkey/0.1/ClearKeySessionManager.cpp | 2 +-
- media/gmp-clearkey/0.1/WMFUtils.cpp   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp 
b/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp
-index 1a9b96bb26ae..1cf9f351a1d0 100644
 a/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp
-+++ b/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp
-@@ -26,7 +26,7 @@
- #include "gmp-task-utils.h"
- #if defined(ENABLE_WMF)
- #include "WMFUtils.h"
--#include 
-+#include 
- #endif
- 
- #include 
-diff --git a/media/gmp-clearkey/0.1/WMFUtils.cpp 
b/media/gmp-clearkey/0.1/WMFUtils.cpp
-index 6f2204a99223..afa651973375 100644
 a/media/gmp-clearkey/0.1/WMFUtils.cpp
-+++ b/media/gmp-clearkey/0.1/WMFUtils.cpp
-@@ -16,7 +16,7 @@
- 
- #include "WMFUtils.h"
- #include "ClearKeyUtils.h"
--#include 
-+#include 
- 
- #include 
- 

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

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

2015-04-30 Thread translation 
commit b160e77f737e34b1fba7a0ba94941d3ca6111cf3
Author: Translation commit bot 
Date:   Thu Apr 30 12:45:03 2015 +

Update translations for bridgedb
---
 sv/LC_MESSAGES/bridgedb.po |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 4dd9bdf..12e8451 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -6,6 +6,7 @@
 # Anders Jensen-Urstad , 2014
 # Emil Johansson , 2015
 # GabSeb, 2014
+# Peter Michanek , 2015
 # Petomatick , 2011
 # ph AA, 2015
 # phst , 2014
@@ -15,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n"
-"PO-Revision-Date: 2015-04-19 08:23+\n"
-"Last-Translator: runasand \n"
+"PO-Revision-Date: 2015-04-30 12:41+\n"
+"Last-Translator: Peter Michanek \n"
 "Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -210,7 +211,7 @@ msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr ""
+msgstr "För att ange bryggor i Tor Borwser, gå till nedladdningssidan %s Tor 
Browser %s och följ instruktionerna för att ladda ner och starta Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: lib/bridgedb/strings.py:126

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

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

2015-04-30 Thread translation 
commit 582efff06e7a10234e36b7a85465296f116d38ca
Author: Translation commit bot 
Date:   Thu Apr 30 12:45:08 2015 +

Update translations for bridgedb_completed
---
 sv/LC_MESSAGES/bridgedb.po |   33 +
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index ce8b18a..12e8451 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -6,6 +6,7 @@
 # Anders Jensen-Urstad , 2014
 # Emil Johansson , 2015
 # GabSeb, 2014
+# Peter Michanek , 2015
 # Petomatick , 2011
 # ph AA, 2015
 # phst , 2014
@@ -14,10 +15,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-02-03 03:24+\n"
-"PO-Revision-Date: 2015-02-23 19:22+\n"
-"Last-Translator: ph AA\n"
+"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n"
+"PO-Revision-Date: 2015-04-30 12:41+\n"
+"Last-Translator: Peter Michanek \n"
 "Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:122
+#: lib/bridgedb/HTTPServer.py:107
 msgid "Sorry! Something went wrong with your request."
 msgstr "Något gick tyvärr fel med din förfrågan."
 
@@ -208,26 +208,27 @@ msgstr "Hur du börjar använda dina bryggor"
 #: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
-"Browser download page %s to start Tor Browser."
-msgstr "För att ange bryggor i Tor Browser, följ instruktionerna på 
nedladdningssidan %s Tor Browser %s för att starta Tor Browser."
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "För att ange bryggor i Tor Borwser, gå till nedladdningssidan %s Tor 
Browser %s och följ instruktionerna för att ladda ner och starta Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: lib/bridgedb/strings.py:126
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and 
follow\n"
 "the wizard until it asks:"
 msgstr "När dialogen \"Nätverksinställningar för Tor\" visas, välj 
\"Konfigurera\" och följ\nstegen tills du kommer till frågan:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: lib/bridgedb/strings.py:130
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor 
connections\n"
 "to the Tor network?"
 msgstr "Blockerar eller filtrerar din Internetleverantör (ISP) anslutningar 
till Tor network?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: lib/bridgedb/strings.py:134
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', 
and\n"
@@ -235,29 +236,29 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Välj 'Ja' och klicka sedan på 'Nästa'. För att konfigurera nya 
bryggor, kopiera och klistra in bryggraderna i textrutan. Klicka slutligen på 
'Anslut' och det borde vara klart för användning! Om du får problem, prova 
att klicka på 'Hjälp'-knappen i 'Tor Network Settings' för vidare hjälp."
 
-#: lib/bridgedb/strings.py:141
+#: lib/bridgedb/strings.py:142
 msgid "Displays this message."
 msgstr "Visa detta meddelande."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:145
+#: lib/bridgedb/strings.py:146
 msgid "Request vanilla bridges."
 msgstr "Leta efter vanliga bryggor."
 
-#: lib/bridgedb/strings.py:146
+#: lib/bridgedb/strings.py:147
 msgid "Request IPv6 bridges."
 msgstr "Begär IPv6-bryggor"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: lib/bridgedb/strings.py:149
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Leta efter en Pluggable Transport av en viss TYPE"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: lib/bridgedb/strings.py:152
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Hämta en kopia av BridgeDB:s publika GnuPG-nyckel."
 

___
tor-commits mailing list
to

[tor-commits] [webwml/master] Add delcert.exe as signature removal tool

2015-04-30 Thread gk 
commit b5a2ec64a830e9011f91dc1c33b755cb0e8f682f
Author: Georg Koppen 
Date:   Thu Apr 30 08:09:52 2015 +

Add delcert.exe as signature removal tool
---
 docs/en/verifying-signatures.wml |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml
index f05b60e..64fc5e3 100644
--- a/docs/en/verifying-signatures.wml
+++ b/docs/en/verifying-signatures.wml
@@ -218,10 +218,10 @@
   You should see a message like "Good signature from ". If you don't, there is a problem. Try these steps again.
   If you want to verify a Windows Tor Browser package you need to first
-  strip off the authenticode signature of it. One tool that can be used for
-  this purpose is osslsigncode. Assuming you
-  have built it on a Linux computer you can enter
+  strip off the authenticode signature of it. Tools that can be used for
+  this purpose are http://osslsigncode.sourceforge.net";>osslsigncode and
+  http://forum.xda-developers.com/showthread.php?t=416175";>delcert.exe.
+  Assuming you have built e.g. osslsigncode on a Linux computer 
you can enter
   /path/to/your/osslsigncode remove-signature \
 /path/to/your/.exe .exe
   Now you can take the sha256sum of the Tor Browser package. On

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

[tor-commits] [bridgedb/develop] Document descriptor parameter in Bridge.updateFromNetworkStatus().

2015-04-30 Thread isis 
commit 7bd8f90d91226fe046fea15fe128614d669cb505
Author: Isis Lovecruft 
Date:   Thu Apr 30 05:54:51 2015 +

Document descriptor parameter in Bridge.updateFromNetworkStatus().
---
 lib/bridgedb/bridges.py |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py
index 5c0afd8..93b9fe9 100644
--- a/lib/bridgedb/bridges.py
+++ b/lib/bridgedb/bridges.py
@@ -1381,10 +1381,11 @@ class Bridge(BridgeBackwardsCompatibility):
 
 def updateFromNetworkStatus(self, descriptor):
 """Update this bridge's attributes from a parsed networkstatus
-descriptor.
+document.
 
-:type ns: :api:`stem.descriptors.router_status_entry.RouterStatusEntry`
-:param ns:
+:type descriptor:
+:api:`stem.descriptors.router_status_entry.RouterStatusEntry`
+:param descriptor: The networkstatus document for this bridge.
 """
 self.descriptors['networkstatus'] = descriptor
 



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

[tor-commits] [bridgedb/develop] Remove duplicate Bridge.Flags.update() during descriptor parsing.

2015-04-30 Thread isis 
commit 69a44c5494d76a330df96dcfd72c8fefe2e76614
Author: Isis Lovecruft 
Date:   Thu Apr 30 06:11:36 2015 +

Remove duplicate Bridge.Flags.update() during descriptor parsing.
---
 lib/bridgedb/Main.py |1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py
index 116f827..44413d2 100644
--- a/lib/bridgedb/Main.py
+++ b/lib/bridgedb/Main.py
@@ -121,7 +121,6 @@ def load(state, splitter, clear=False):
 for router in networkstatuses:
 bridge = Bridge()
 bridge.updateFromNetworkStatus(router)
-bridge.flags.update(router.flags)
 
 try:
 bridge.assertOK()

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