[tor-commits] [atlas/master] Move the relay and bridge status next to its name

2017-04-20 Thread irl
commit 940fa902df5bf55d9ef3b11a6598b58afe7907c2
Author: cypherpunks 
Date:   Mon Apr 17 13:41:59 2017 +

Move the relay and bridge status next to its name

Closes #21752.
---
 templates/details/bridge.html | 19 ---
 templates/details/router.html | 19 ---
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/templates/details/bridge.html b/templates/details/bridge.html
index 4d4d666..4ca0f96 100644
--- a/templates/details/bridge.html
+++ b/templates/details/bridge.html
@@ -1,11 +1,11 @@
-Details for: <%= relay.get('nickname') %>
-
+
+Details for: <%= relay.get('nickname') %>
+<% if (relay.get('running') === false) { %>
+
+<% } else { %>
+
+<% } %>
+
 
 General Overall information on the Tor bridge
 
@@ -88,9 +88,6 @@
 <%= relay.get('uptime_hrfull') %>
 <% } %>
 
-Running
-<%= relay.get('running') %>
-
 
 
 
diff --git a/templates/details/router.html b/templates/details/router.html
index c915a51..e66c5a0 100644
--- a/templates/details/router.html
+++ b/templates/details/router.html
@@ -1,11 +1,11 @@
-Details for: <%= relay.get('nickname') %>
-
+
+Details for: <%= relay.get('nickname') %>
+<% if (relay.get('running') === false) { %>
+
+<% } else { %>
+
+<% } %>
+
 
 General Overall information on the Tor relay
 
@@ -142,9 +142,6 @@
 <%= relay.get('uptime_hrfull') %>
 <% } %>
 
-Running
-<%= relay.get('running') %>
-
 
 
 



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


[tor-commits] [atlas/master] Merge the current status and properties columns

2017-04-20 Thread irl
commit 7e62f64cc80770b08d0a47178c358e8d3dccd5fe
Author: cypherpunks 
Date:   Mon Apr 17 13:58:24 2017 +

Merge the current status and properties columns

Moving the relay and bridge status next to its name made the current
status column contain a single item (the uptime or downtime). Because
this is a waste of screen space the current status column is merged into
the properties column.

The merge includes some reordering to ensure the fingerprint of the
relay and bridge is always the first item.
---
 templates/details/bridge.html | 33 +
 templates/details/router.html | 33 +
 2 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/templates/details/bridge.html b/templates/details/bridge.html
index 4ca0f96..dae5a6b 100644
--- a/templates/details/bridge.html
+++ b/templates/details/bridge.html
@@ -11,7 +11,7 @@
 
 
 
-
+
 Configuration
 
   Nickname
@@ -28,20 +28,27 @@
 
 
 
-
+
 <% if (relay.get('running') === true) { %>
 Properties
-
 <% } else { %>
 Last Known Properties
-
-Last Seen
-<%= relay.get('last_seen') %>
 <% } %>
+
 
 Hashed Fingerprint
 <%= relay.get('fingerprint') %>
 
+<% if (relay.get('running') === true) { %>
+Uptime
+<%= relay.get('uptime_hrfull') %>
+<% } else { %>
+Downtime
+<%= relay.get('downtime') %>
+Last Seen
+<%= relay.get('last_seen') %>
+<% } %>
+
 Flags
 <% _.each(relay.get('flags'), function(flag) { %>
 
@@ -76,20 +83,6 @@
 
 
 
-
-Current Status
-
-
-<% if (relay.get('running') === false) { %>
-Downtime
-<%= relay.get('downtime') %>
-<% } else {%>
-Uptime
-<%= relay.get('uptime_hrfull') %>
-<% } %>
-
-
-
 
 
 
diff --git a/templates/details/router.html b/templates/details/router.html
index e66c5a0..5ffec67 100644
--- a/templates/details/router.html
+++ b/templates/details/router.html
@@ -11,7 +11,7 @@
 
 
 
-
+
 Configuration
 
   Nickname
@@ -60,20 +60,27 @@
 
 
 
-
+
 <% if (relay.get('running') === true) { %>
 Properties
-
 <% } else { %>
 Last Known Properties
-
-Last Seen
-<%= relay.get('last_seen') %>
 <% } %>
+
 
 Fingerprint
 <%= relay.get('fingerprint') %>
 
+<% if (relay.get('running') === true) { %>
+Uptime
+<%= relay.get('uptime_hrfull') %>
+<% } else { %>
+Downtime
+<%= relay.get('downtime') %>
+Last Seen
+<%= relay.get('last_seen') %>
+<% } %>
+
 Flags
 <% _.each(relay.get('flags'), function(flag) { %>
 
@@ -130,20 +137,6 @@
 
 
 
-
-Current Status
-
-
-<% if (relay.get('running') === false) { %>
-Downtime
-<%= relay.get('downtime') %>
-<% } else {%>
-Uptime
-<%= relay.get('uptime_hrfull') %>
-<% } %>
-
-
-
 
 
 

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


[tor-commits] [atlas/master] Set an error number when rendering the Top 10 page

2017-04-20 Thread irl
commit 9f75bbe9a9e9edb8eecd9d2cff4e77fcbb04df9f
Author: cypherpunks 
Date:   Mon Apr 17 12:39:11 2017 +

Set an error number when rendering the Top 10 page

Essentially this resets the error number so previous errors are
forgotten.

Closes #21970.
---
 js/router.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/router.js b/js/router.js
index 080a750..5219c23 100644
--- a/js/router.js
+++ b/js/router.js
@@ -105,8 +105,9 @@ define([
 
 doSearchView.collection.url = 
"https://onionoo.torproject.org/summary?type=relay&order=-consensus_weight&limit=10&running=true";;
 doSearchView.collection.lookup({
-success: function(relays){
+success: function(err){
 doSearchView.relays = doSearchView.collection.models;
+doSearchView.error = err;
 doSearchView.render("");
$("#search-title").text("Top 10 Relays by Consensus 
Weight");
 $(".progress").hide();

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


[tor-commits] [atlas/master] Add proper headers for each family member group

2017-04-20 Thread irl
commit 502b228cc5076da0d781c54947943de787218328
Author: cypherpunks 
Date:   Mon Apr 17 00:45:17 2017 +

Add proper headers for each family member group
---
 templates/details/router.html | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/templates/details/router.html b/templates/details/router.html
index 603282a..c915a51 100644
--- a/templates/details/router.html
+++ b/templates/details/router.html
@@ -109,15 +109,17 @@
 Last Restarted
 <%= relay.get('last_restarted') %>
 
-Family Members
+Effective Family 
Members
 
-Effective family members:
 <% if (relay.get('effective_family') !== null) { %><% 
_.each(relay.get('effective_family'), function(member) { %><% var valid = 
member.match(RegExp("^\$[A-F0-9]{40}$")); %>
 <% if (valid) { %><% } %><%= member %><% if (valid) { %><% 
}}); %>
-<% } %><% if (relay.get('effective_family') == null) { %>none<% } %>
-Alleged family members:
+<% } else { %>none<% } %>
+
+Alleged Family Members
+
 <% if (relay.get('alleged_family') !== null) { %><% 
_.each(relay.get('alleged_family'), function(member) { %><% var valid = 
member.match(RegExp("^\$[A-F0-9]{40}$")); %>
-<% if (valid) { %><% } %><%= member %><% if (valid) 
{ %><% }}); %><% } %><% if (relay.get('alleged_family') == null) { %>none<% 
} %>
+<% if (valid) { %><% } %><%= member %><% if (valid) 
{ %><% }}); %>
+<% } else { %>none<% } %>
 
 
 Platform

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


[tor-commits] [stem/master] Support SETEVENTS with tor-prompt's run argument

2017-04-20 Thread atagar
commit 9302fd23ab19cf2c294a376392525c88c3ef0436
Author: Damian Johnson 
Date:   Wed Apr 19 10:43:28 2017 -0700

Support SETEVENTS with tor-prompt's run argument

Adding special handling for SETEVENTS so running...

  tor-prompt --run "SETEVENTS BW DEBUG"

... will listen for events until the user presses a key. These events can be
piped to a file. Something like this was requested by anrelanos on...

  https://trac.torproject.org/projects/tor/ticket/21590
---
 stem/interpreter/__init__.py | 23 ++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/stem/interpreter/__init__.py b/stem/interpreter/__init__.py
index 8cdbb3c..033d819 100644
--- a/stem/interpreter/__init__.py
+++ b/stem/interpreter/__init__.py
@@ -126,7 +126,28 @@ def main():
 interpreter = stem.interpreter.commands.ControlInterpreter(controller)
 
 if args.run_cmd:
-  interpreter.run_command(args.run_cmd, print_response = True)
+  if args.run_cmd.upper().startswith('SETEVENTS '):
+# TODO: we can use a lambda here when dropping python 2.x support, but
+# until then print's status as a keyword prevents it from being used in
+# lambdas
+
+def handle_event(event_message):
+  print(format(str(event_message), *STANDARD_OUTPUT))
+
+controller._handle_event = handle_event
+
+if sys.stdout.isatty():
+  events = args.run_cmd.upper().split(' ', 1)[1]
+  print(format('Listening to %s events. Press any key to quit.\n' % 
events, *HEADER_BOLD_OUTPUT))
+
+controller.msg(args.run_cmd)
+
+try:
+  raw_input()
+except (KeyboardInterrupt, stem.SocketClosed) as exc:
+  pass
+  else:
+interpreter.run_command(args.run_cmd, print_response = True)
 elif args.run_path:
   try:
 for line in open(args.run_path).readlines():

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


[tor-commits] [webwml/master] Deactivate writer position

2017-04-20 Thread hiro
commit f3da1460c78c2a8dc52306fcc00e3415fa784ead
Author: hiromipaw 
Date:   Thu Apr 20 18:00:19 2017 +0200

Deactivate writer position
---
 about/en/jobs.wml | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/about/en/jobs.wml b/about/en/jobs.wml
index 27266a0..c8110fe 100644
--- a/about/en/jobs.wml
+++ b/about/en/jobs.wml
@@ -10,16 +10,16 @@
 Jobs
   

-   The Tor Project is always looking for more great people to 
join our team!
+   #The Tor Project is always looking for more great people to 
join our team!
 
-   #At the moment, we don't have any official open positions. 
Please check back
-   #soon, though! In the meantime, you may want to glance at our
-   #volunteers page.
-   #
-   Specifically, we're looking for the following people 
currently:
-   
-   Writer/Editor
-   
+   At the moment, we don't have any official open positions. 
Please check back
+   soon, though! In the meantime, you may want to glance at our
+   volunteers page.
+
+   #Specifically, we're looking for the following people 
currently:
+   #
+   #  Writer/Editor
+   #
 
 
In the past, we looked for the following people:

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


[tor-commits] [webwml/staging] Remove Hardened Tor Browser from the download page

2017-04-20 Thread hiro
commit bede5eecf8cb0e496afe14a5848ba1a0801f4abc
Author: Nicolas Vigier 
Date:   Thu Apr 20 13:50:39 2017 +0200

Remove Hardened Tor Browser from the download page
---
 projects/en/torbrowser.wml | 24 
 1 file changed, 24 deletions(-)

diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 6b85a33..f4073e9 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -540,30 +540,6 @@
   
 
 
-
-Hardened Tor Browser
- 
-  
-
-  
-
-  Language
-  
Linux(-hardened)
-
-  
-  
-
-  All
-  64-bit
-  (sig)
-  
-
-  
-
-  
-  
-
-
 
 Tor Browser Sandbox
  



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


[tor-commits] [webwml/staging] Deactivate writer position

2017-04-20 Thread hiro
commit f3da1460c78c2a8dc52306fcc00e3415fa784ead
Author: hiromipaw 
Date:   Thu Apr 20 18:00:19 2017 +0200

Deactivate writer position
---
 about/en/jobs.wml | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/about/en/jobs.wml b/about/en/jobs.wml
index 27266a0..c8110fe 100644
--- a/about/en/jobs.wml
+++ b/about/en/jobs.wml
@@ -10,16 +10,16 @@
 Jobs
   

-   The Tor Project is always looking for more great people to 
join our team!
+   #The Tor Project is always looking for more great people to 
join our team!
 
-   #At the moment, we don't have any official open positions. 
Please check back
-   #soon, though! In the meantime, you may want to glance at our
-   #volunteers page.
-   #
-   Specifically, we're looking for the following people 
currently:
-   
-   Writer/Editor
-   
+   At the moment, we don't have any official open positions. 
Please check back
+   soon, though! In the meantime, you may want to glance at our
+   volunteers page.
+
+   #Specifically, we're looking for the following people 
currently:
+   #
+   #  Writer/Editor
+   #
 
 
In the past, we looked for the following people:

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


[tor-commits] [webwml/staging] Add new Tor Browser version: 7.0a3

2017-04-20 Thread hiro
commit 519da837f714d7d5dd2897b507412271b6fece74
Author: Nicolas Vigier 
Date:   Thu Apr 20 13:53:32 2017 +0200

Add new Tor Browser version: 7.0a3
---
 include/versions.wmi   | 20 ++--
 projects/torbrowser/RecommendedTBBVersions |  6 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 59dd3d2..25dd28b 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -5,29 +5,29 @@
 
 maint-6.5
 6.5.2
-7.0a2
+7.0a3
 
 6.5.2
 2017-04-19
-7.0a2
-2017-03-08
+7.0a3
+2017-04-20
 
 6.5.2
 2017-04-19
 6.5.2
 2017-04-19
-7.0a2
-2017-03-08
-7.0a2
-2017-03-08
+7.0a3
+2017-04-20
+7.0a3
+2017-04-20
 
 6.5.2
 2017-04-19
 6.5.2
 2017-04-19
-7.0a2
-2017-03-08
-0.0.3
+7.0a3
+2017-04-20
+0.0.6
 
 ../dist/torbrowser//tor-win32-.zip
 
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index bf79c79..925a307 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -12,5 +12,9 @@
 "7.0a2-MacOS",
 "7.0a2-Windows",
 "7.0a2-hardened",
-"7.0a2-hardened-Linux"
+"7.0a2-hardened-Linux",
+"7.0a3",
+"7.0a3-Linux",
+"7.0a3-MacOS",
+"7.0a3-Windows"
 ]



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


[tor-commits] [webwml/staging] Add new Tor Browser version: 6.5.2

2017-04-20 Thread hiro
commit ed07a6fda97fae074ff70ff33b58cd40798e3c5a
Author: Nicolas Vigier 
Date:   Wed Apr 19 20:49:45 2017 +0200

Add new Tor Browser version: 6.5.2
---
 include/versions.wmi   | 22 +++---
 projects/torbrowser/RecommendedTBBVersions |  4 
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index d23153c..59dd3d2 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -4,27 +4,27 @@
 0.2.9.10
 
 maint-6.5
-6.5.1
+6.5.2
 7.0a2
 
-6.5.1
-2017-03-07
+6.5.2
+2017-04-19
 7.0a2
 2017-03-08
 
-6.5.1
-2017-03-07
-6.5.1
-2017-03-07
+6.5.2
+2017-04-19
+6.5.2
+2017-04-19
 7.0a2
 2017-03-08
 7.0a2
 2017-03-08
 
-6.5.1
-2017-03-07
-6.5.1
-2017-03-07
+6.5.2
+2017-04-19
+6.5.2
+2017-04-19
 7.0a2
 2017-03-08
 0.0.3
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 4a6eeab..bf79c79 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -3,6 +3,10 @@
 "6.5.1-Linux",
 "6.5.1-MacOS",
 "6.5.1-Windows",
+"6.5.2",
+"6.5.2-Linux",
+"6.5.2-MacOS",
+"6.5.2-Windows",
 "7.0a2",
 "7.0a2-Linux",
 "7.0a2-MacOS",



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


[tor-commits] [webwml/master] Add new Tor Browser version: 7.0a3

2017-04-20 Thread boklm
commit 519da837f714d7d5dd2897b507412271b6fece74
Author: Nicolas Vigier 
Date:   Thu Apr 20 13:53:32 2017 +0200

Add new Tor Browser version: 7.0a3
---
 include/versions.wmi   | 20 ++--
 projects/torbrowser/RecommendedTBBVersions |  6 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 59dd3d2..25dd28b 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -5,29 +5,29 @@
 
 maint-6.5
 6.5.2
-7.0a2
+7.0a3
 
 6.5.2
 2017-04-19
-7.0a2
-2017-03-08
+7.0a3
+2017-04-20
 
 6.5.2
 2017-04-19
 6.5.2
 2017-04-19
-7.0a2
-2017-03-08
-7.0a2
-2017-03-08
+7.0a3
+2017-04-20
+7.0a3
+2017-04-20
 
 6.5.2
 2017-04-19
 6.5.2
 2017-04-19
-7.0a2
-2017-03-08
-0.0.3
+7.0a3
+2017-04-20
+0.0.6
 
 ../dist/torbrowser//tor-win32-.zip
 
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index bf79c79..925a307 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -12,5 +12,9 @@
 "7.0a2-MacOS",
 "7.0a2-Windows",
 "7.0a2-hardened",
-"7.0a2-hardened-Linux"
+"7.0a2-hardened-Linux",
+"7.0a3",
+"7.0a3-Linux",
+"7.0a3-MacOS",
+"7.0a3-Windows"
 ]

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


[tor-commits] [webwml/master] Remove Hardened Tor Browser from the download page

2017-04-20 Thread boklm
commit bede5eecf8cb0e496afe14a5848ba1a0801f4abc
Author: Nicolas Vigier 
Date:   Thu Apr 20 13:50:39 2017 +0200

Remove Hardened Tor Browser from the download page
---
 projects/en/torbrowser.wml | 24 
 1 file changed, 24 deletions(-)

diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 6b85a33..f4073e9 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -540,30 +540,6 @@
   
 
 
-
-Hardened Tor Browser
- 
-  
-
-  
-
-  Language
-  
Linux(-hardened)
-
-  
-  
-
-  All
-  64-bit
-  (sig)
-  
-
-  
-
-  
-  
-
-
 
 Tor Browser Sandbox
  



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


[tor-commits] [meek/master] Modify http.DefaultTransport directly, don't use a copy.

2017-04-20 Thread dcf
commit 0ee2dfb6e2868c432fbe05e8ee8080584e8e03d2
Author: David Fifield 
Date:   Wed Apr 19 22:59:07 2017 -0700

Modify http.DefaultTransport directly, don't use a copy.

I don't see a reason to make a copy when this is all we use; also
"go vet" complained:

meek-client.go:403: assignment copies lock value to httpTransport: 
net/http.Transport contains sync.Mutex
---
 meek-client/meek-client.go | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go
index 8cbc84a..c3eadc4 100644
--- a/meek-client/meek-client.go
+++ b/meek-client/meek-client.go
@@ -82,9 +82,10 @@ const (
 
 var ptInfo pt.ClientInfo
 
-// This is the RoundTripper used to make all our requests (when --helper is not
-// used).
-var httpTransport http.Transport
+// We use this RoundTripper to make all our requests (when --helper is not
+// used). We use the defaults, except we take control of the Proxy setting
+// (notably, disabling the default ProxyFromEnvironment).
+var httpTransport *http.Transport = http.DefaultTransport.(*http.Transport)
 
 // Store for command line options.
 var options struct {
@@ -396,11 +397,8 @@ func main() {
}
}
 
-   // We make a copy of DefaultTransport because we want the default Dial
-   // and TLSHandshakeTimeout settings. But we want to disable the default
-   // ProxyFromEnvironment setting. Proxy is overridden below if
-   // options.ProxyURL is set.
-   httpTransport = *http.DefaultTransport.(*http.Transport)
+   // Disable the default ProxyFromEnvironment setting. httpTransport.Proxy
+   // is overridden below if options.ProxyURL is set.
httpTransport.Proxy = nil
 
// Command-line proxy overrides managed configuration.



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


[tor-commits] [meek/master] fmt

2017-04-20 Thread dcf
commit 7c239cfb174080df475435343ad1202af75a41b3
Author: David Fifield 
Date:   Thu Apr 20 00:50:04 2017 -0700

fmt
---
 meek-server/meek-server.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go
index d0be266..2b49897 100644
--- a/meek-server/meek-server.go
+++ b/meek-server/meek-server.go
@@ -273,7 +273,7 @@ func (state *State) ExpireSessions() {
}
 }
 
-func listenTLS(network string, addr *net.TCPAddr, getCertificate func 
(*tls.ClientHelloInfo) (*tls.Certificate, error)) (net.Listener, error) {
+func listenTLS(network string, addr *net.TCPAddr, getCertificate 
func(*tls.ClientHelloInfo) (*tls.Certificate, error)) (net.Listener, error) {
// This is cribbed from the source of net/http.Server.ListenAndServeTLS.
// We have to separate the Listen and Serve parts because we need to
// report the listening address before entering Serve (which is an
@@ -307,7 +307,7 @@ func startListener(network string, addr *net.TCPAddr) 
(net.Listener, error) {
return startServer(ln)
 }
 
-func startListenerTLS(network string, addr *net.TCPAddr, getCertificate func 
(*tls.ClientHelloInfo) (*tls.Certificate, error)) (net.Listener, error) {
+func startListenerTLS(network string, addr *net.TCPAddr, getCertificate 
func(*tls.ClientHelloInfo) (*tls.Certificate, error)) (net.Listener, error) {
ln, err := listenTLS(network, addr, getCertificate)
if err != nil {
return nil, err
@@ -386,7 +386,7 @@ func main() {
// The outputs of this block of code are the disableTLS,
// missing443Listener, and getCertificate variables.
var missing443Listener = false
-   var getCertificate func (*tls.ClientHelloInfo) (*tls.Certificate, error)
+   var getCertificate func(*tls.ClientHelloInfo) (*tls.Certificate, error)
if disableTLS {
if acmeEmail != "" || acmeHostnamesCommas != "" || certFilename 
!= "" || keyFilename != "" {
log.Fatalf("The --acme-email, --acme-hostnames, --cert, 
and --key options are not allowed with --disable-tls.")

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


[tor-commits] [tor-browser-build/master] Pick up build3 from Mozilla and bug fixes

2017-04-20 Thread boklm
commit da2bb257968d238a538ebc6ddfb7da2e35041985
Author: Nicolas Vigier 
Date:   Thu Apr 20 09:47:04 2017 +0200

Pick up build3 from Mozilla and bug fixes

tor-browser-bundle.git commit: 421091532d3536893e715f62cab9055cd822b95a
---
 projects/firefox-langpacks/config | 2 +-
 projects/firefox/config   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/firefox-langpacks/config 
b/projects/firefox-langpacks/config
index a645b92..39f04cb 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") 
%]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build1
+  ff_build: build3
   ff_arch: linux-i686
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
diff --git a/projects/firefox/config b/projects/firefox/config
index 14c1cd5..2c74e4b 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-2-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg

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


[tor-commits] [tor-browser-build/master] Bump sandboxed to browser tag to 0.0.6

2017-04-20 Thread boklm
commit 41a5df93e6c92b3481057f077201472caef8b9e5
Author: Nicolas Vigier 
Date:   Thu Apr 20 09:44:20 2017 +0200

Bump sandboxed to browser tag to 0.0.6

tor-browser-bundle.git commit: 947fedb72f4a43b46fcc2e72531db79e8aa7d943
---
 projects/sandbox/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/sandbox/config b/projects/sandbox/config
index 9dc52c6..218a276 100644
--- a/projects/sandbox/config
+++ b/projects/sandbox/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.0.5
+version: 0.0.6
 git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser
 git_hash: 'sandboxed-tor-browser-[% c("version") %]'
 tag_gpg_id: 1



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