[tor-commits] [snowflake/master] multiple arbitrary ice servers can be passed as client flag (close #24)

[serene]

commit 9daa6c4b71bf4a366aa65a65f1551b8febd7a1df
Author: Serene Han 
Date:   Sat Mar 5 17:01:30 2016 -0800

multiple arbitrary ice servers can be passed as client flag (close #24)
---
 client/snowflake.go | 10 +-
 client/torrc|  2 +-
 client/util.go  |  2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/client/snowflake.go b/client/snowflake.go
index 4287425..f10c50e 100644
--- a/client/snowflake.go
+++ b/client/snowflake.go
@@ -64,7 +64,6 @@ func dialWebRTC() (*webRTCConn, error) {
// TODO: [#3] Fetch ICE server information from Broker.
// TODO: [#18] Consider TURN servers here too.
config := webrtc.NewConfiguration(iceServers...)
-
broker := NewBrokerChannel(brokerURL, frontDomain)
if nil == broker {
return nil, errors.New("Failed to prepare BrokerChannel")
@@ -160,10 +159,6 @@ func readSignalingMessages(f *os.File) {
 func main() {
// var err error
webrtc.SetLoggingVerbosity(1)
-   flag.StringVar(, "url", "", "URL of signaling broker")
-   flag.StringVar(, "front", "", "front domain")
-   flag.Var(, "ice", "comma-separated list of ICE servers")
-   flag.Parse()
logFile, err := os.OpenFile("snowflake.log", 
os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)
if err != nil {
log.Fatal(err)
@@ -172,6 +167,11 @@ func main() {
log.SetOutput(logFile)
log.Println("\nStarting Snowflake Client...")
 
+   flag.StringVar(, "url", "", "URL of signaling broker")
+   flag.StringVar(, "front", "", "front domain")
+   flag.Var(, "ice", "comma-separated list of ICE servers")
+   flag.Parse()
+
// Expect user to copy-paste if
// TODO: Maybe just get rid of copy-paste entirely.
if "" != brokerURL {
diff --git a/client/torrc b/client/torrc
index c4af61f..b6d0f61 100644
--- a/client/torrc
+++ b/client/torrc
@@ -4,6 +4,6 @@ DataDirectory datadir
 ClientTransportPlugin snowflake exec ./client \
 -url https://snowflake-reg.appspot.com/ \
 -front www.google.com \
--ice stun:stun.l.google.com:19302
+-ice stun:stun.l.google.com:19302,stun:s1.taraba.net
 
 Bridge snowflake 0.0.3.0:1
diff --git a/client/util.go b/client/util.go
index 02132f2..6a2b6de 100644
--- a/client/util.go
+++ b/client/util.go
@@ -19,8 +19,10 @@ func (i *IceServerList) String() string {
 }
 
 func (i *IceServerList) Set(s string) error {
+   log.Println("IceServerList:")
for _, server := range strings.Split(s, ",") {
// TODO: STUN / TURN url format validation?
+   log.Println(server)
option := webrtc.OptionIceServer(server)
*i = append(*i, option)
}



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

[tor-commits] [snowflake/master] provide 'silent' param on snowflake proxy to disable confirmation dialog

[serene]

commit 39be8403a430abab13c77cded2b13bf06324e25c
Author: Serene Han 
Date:   Mon Mar 7 22:58:23 2016 -0800

provide 'silent' param on snowflake proxy to disable confirmation dialog
---
 proxy/snowflake.coffee   | 4 +++-
 proxy/spec/snowflake.spec.coffee | 8 
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee
index 90150ad..4a98472 100644
--- a/proxy/snowflake.coffee
+++ b/proxy/snowflake.coffee
@@ -14,6 +14,7 @@ DEFAULT_RELAY =
 COPY_PASTE_ENABLED = false
 
 DEBUG = false
+silenceNotifications = false
 query = null
 if 'undefined' != typeof window && window.location
   query = Query.parse(window.location.search.substr(1))
@@ -190,6 +191,7 @@ dbg = (msg) -> log msg if true == snowflake.ui.debug
 
 init = ->
   ui = new UI()
+  silenceNotifications = Params.getBool(query, 'silent', false)
   brokerUrl = Params.getString(query, 'broker', DEFAULT_BROKER)
   broker = new Broker brokerUrl
   snowflake = new Snowflake broker, ui
@@ -205,7 +207,7 @@ init = ->
 # Notification of closing tab with active proxy.
 # TODO: Opt-in/out parameter or cookie
 window.onbeforeunload = ->
-  if MODE.WEBRTC_READY == snowflake.state
+  if !silenceNotifications && MODE.WEBRTC_READY == snowflake.state
 return CONFIRMATION_MESSAGE
   null
 
diff --git a/proxy/spec/snowflake.spec.coffee b/proxy/spec/snowflake.spec.coffee
index f3fbae8..9b63419 100644
--- a/proxy/spec/snowflake.spec.coffee
+++ b/proxy/spec/snowflake.spec.coffee
@@ -61,6 +61,7 @@ describe 'Snowflake', ->
 expect(s.proxyPairs.length).toBe 2
 
   it 'gives a dialog when closing, only while active', ->
+silenceNotifications = false
 snowflake.state = MODE.WEBRTC_READY
 msg = window.onbeforeunload()
 expect(snowflake.state).toBe MODE.WEBRTC_READY
@@ -70,3 +71,10 @@ describe 'Snowflake', ->
 msg = window.onbeforeunload()
 expect(snowflake.state).toBe MODE.INIT
 expect(msg).toBe null
+
+  it 'does not give a dialog when silent flag is on', ->
+silenceNotifications = true
+snowflake.state = MODE.WEBRTC_READY
+msg = window.onbeforeunload()
+expect(snowflake.state).toBe MODE.WEBRTC_READY
+expect(msg).toBe null

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

[tor-commits] [snowflake/master] fix datachannel remote vs. local closing during client's peerconnection cleanup

[serene]

commit 91673a4abe85e61cc397c5c4c359c80382958e46
Author: Serene Han 
Date:   Sun Mar 6 11:40:00 2016 -0800

fix datachannel remote vs. local closing during client's peerconnection 
cleanup
---
 client/webrtc.go | 46 +-
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/client/webrtc.go b/client/webrtc.go
index 2388e9a..e2e8280 100644
--- a/client/webrtc.go
+++ b/client/webrtc.go
@@ -48,17 +48,7 @@ func (c *webRTCConn) Write(b []byte) (int, error) {
 func (c *webRTCConn) Close() error {
var err error = nil
log.Printf("WebRTC: Closing")
-   if nil != c.snowflake {
-   s := c.snowflake
-   c.snowflake = nil
-   log.Printf("WebRTC: closing DataChannel")
-   s.Close()
-   }
-   if nil != c.pc {
-   log.Printf("WebRTC: closing PeerConnection")
-   err = c.pc.Close()
-   c.pc = nil
-   }
+   c.cleanup()
close(c.offerChannel)
close(c.answerChannel)
close(c.errorChannel)
@@ -127,9 +117,12 @@ func (c *webRTCConn) ConnectLoop() {
<-c.reset
log.Println(" --- snowflake connection reset ---")
}
+   <-time.After(time.Second * 1)
+   c.cleanup()
}
 }
 
+// Create and prepare callbacks on a new WebRTC PeerConnection.
 func (c *webRTCConn) preparePeerConnection() {
if nil != c.pc {
c.pc.Close()
@@ -178,6 +171,9 @@ func (c *webRTCConn) preparePeerConnection() {
 
 // Create a WebRTC DataChannel locally.
 func (c *webRTCConn) establishDataChannel() error {
+   if c.snowflake != nil {
+   panic("Unexpected datachannel already exists!")
+   }
dc, err := c.pc.CreateDataChannel("snowflake", webrtc.Init{})
// Triggers "OnNegotiationNeeded" on the PeerConnection, which will 
prepare
// an SDP offer while other goroutines operating on this struct handle 
the
@@ -201,20 +197,20 @@ func (c *webRTCConn) establishDataChannel() error {
c.snowflake = dc
}
dc.OnClose = func() {
-   // Disable the DataChannel as a write destination.
// Future writes will go to the buffer until a new DataChannel 
is available.
-   log.Println("WebRTC: DataChannel.OnClose")
-   // Only reset if this OnClose was triggered remotely.
if nil == c.snowflake {
-   panic("Should not have nil snowflake before closing. ")
+   // Closed locally, as part of a reset.
+   log.Println("WebRTC: DataChannel.OnClose [locally]")
+   return
}
+   // Closed remotely, need to reset everything.
+   // Disable the DataChannel as a write destination.
+   log.Println("WebRTC: DataChannel.OnClose [remotely]")
c.snowflake = nil
// TODO: Need a way to update the circuit so that when a new 
WebRTC
// data channel is available, the relay actually recognizes the 
new
// snowflake?
c.Reset()
-   // c.Close()
-   // c.endChannel <- struct{}{}
}
dc.OnMessage = func(msg []byte) {
// log.Println("ONMESSAGE: ", len(msg))
@@ -290,3 +286,19 @@ func (c *webRTCConn) Reset() {
log.Println("WebRTC resetting...")
}()
 }
+
+func (c *webRTCConn) cleanup() {
+   if nil != c.snowflake {
+   s := c.snowflake
+   log.Printf("WebRTC: closing DataChannel")
+   // Setting snowflak to nil *before* Close indicates to OnClose 
that it
+   // was locally triggered.
+   c.snowflake = nil
+   s.Close()
+   }
+   if nil != c.pc {
+   log.Printf("WebRTC: closing PeerConnection")
+   c.pc.Close()
+   c.pc = nil
+   }
+}



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

[tor-commits] [webwml/master] Nyx subtask for improving event dialog

[atagar]

commit 055b7856191b9bcc54b6d6c48f893a26320ff623
Author: Damian Johnson 
Date:   Mon Mar 7 19:35:12 2016 -0800

Nyx subtask for improving event dialog

Another subtask that came to mind and would make an interesting item for 
this
project.
---
 getinvolved/en/volunteer.wml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index bdfa9a5..8b6c894 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -990,6 +990,7 @@ get ya started...
   Unit testing! Nyx has https://gitweb.torproject.org/nyx.git/tree/test;>started adding tests 
but it's still very minimal. Achieving any substantial code coverage will 
require us to figure out how to unit test curses components.
   Onionoo provides additional relay information that could enrich our 
connection panel such as geoip and rdns. Trick is that at present we can only 
query it on a per-relay basis which would leak our connections (no-go for 
security). However, if we could get information about all relays in bulk it 
would sidestep this. For some old thoughts on this see https://trac.torproject.org/projects/tor/wiki/doc/arm#CircuitDetails;>here.
   Relay setup wizard. Our last release had this (screenshots: https://www.atagar.com/transfer/tmp/arm_wizard1.png;>1, https://www.atagar.com/transfer/tmp/arm_wizard2.png;>2, https://www.atagar.com/transfer/tmp/arm_wizard3.png;>3). This has 
been removed because including it directly in Nyx confused users, but we might 
want to resurrect it as a separate setup-tor-relay command.
+  https://trac.torproject.org/projects/tor/ticket/18499;>Improved 
dialog for selecting events to log.
   ... and more! Again, don't hesitate to propose ideas of your 
own.
 
 

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

[tor-commits] [webwml/master] Add 'Let's Encrypt Client' project idea

[atagar]

commit cb194f00b056f332a670258a4ca6842b7d3c0879
Author: Damian Johnson 
Date:   Mon Mar 7 18:49:27 2016 -0800

Add 'Let's Encrypt Client' project idea

Project idea from the EFF.
---
 getinvolved/en/volunteer.wml | 35 +++
 1 file changed, 35 insertions(+)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 21f199e..bdfa9a5 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -1352,6 +1352,41 @@ implementation.
 
 
 
+
+
+Expand the OS and Server Support of the Let's Encrypt Client
+
+Language: Python, Bash
+
+Likely Mentors: Brad Warren (bmw)
+
+
+https://letsencrypt.org/;>Let's Encrypt is a free and open
+certificate authority that allows its users to setup HTTPS on their web
+server in a matter of seconds. The project uses a new protocol called ACME
+to automatically perform domain validation and certificate issuance.
+
+
+
+The Let's Encrypt client currently works on most Unix-like OSes and is
+able to automatically set up HTTPS on many Apache configurations. The
+purpose of this project is to expand Let's Encrypt support to new
+systems.
+
+
+
+Potential targets include:
+
+
+
+  Better OS X support including a port or Homebrew package
+  A Let's Encrypt client for Windows / IIS
+  Handling of more obscure Apache configurations
+  Automated HTTPS configuration for other web servers such as Nginx or 
lighttpd
+  Improved support people using shared hosting who are unable to use 
the full Let's Encrypt client on their server
+
+
+
 
 
 Ahmia - Hidden Service Search

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

[tor-commits] [nyx/master] Drop tor.password nyxrc option

[atagar]

commit d3a0279eddd15559739846d723e54b3b16aa2fd0
Author: Damian Johnson 
Date:   Mon Mar 7 16:49:34 2016 -0800

Drop tor.password nyxrc option

Tor offers two authentication options: cookie and password. The former is
access to a file on disk while the later is something the user knows. By
allowing users to specify a nyxrc line with the password it's no better than
cookie auth, so we should encourage that.
---
 nyx/starter.py | 12 
 nyxrc.sample   |  1 -
 2 files changed, 13 deletions(-)

diff --git a/nyx/starter.py b/nyx/starter.py
index 6a88912..81a892f 100644
--- a/nyx/starter.py
+++ b/nyx/starter.py
@@ -68,7 +68,6 @@ def main(config):
   controller = init_controller(
 control_port = control_port,
 control_socket = control_socket,
-password = config.get('tor.password', None),
 password_prompt = True,
 chroot_path = config.get('tor.chroot', ''),
   )
@@ -80,7 +79,6 @@ def main(config):
   _warn_if_unable_to_get_pid(controller)
   _setup_freebsd_chroot(controller)
   _notify_of_unknown_events()
-  _clear_password()
   _use_english_subcommands()
   _use_unicode()
   _set_process_name()
@@ -215,16 +213,6 @@ def _notify_of_unknown_events():
 log.info('setup.unknown_event_types', event_types = ', 
'.join(missing_events))
 
 
-@uses_settings
-def _clear_password(config):
-  """
-  Removing the reference to our controller password so the memory can be freed.
-  Without direct memory access this is about the best we can do to clear it.
-  """
-
-  config.set('tor.password', None)
-
-
 def _use_english_subcommands():
   """
   Make subcommands we run (ps, netstat, etc) provide us with English results.
diff --git a/nyxrc.sample b/nyxrc.sample
index 160ce68..612af6b 100644
--- a/nyxrc.sample
+++ b/nyxrc.sample
@@ -1,5 +1,4 @@
 # Startup options
-tor.password
 startup.events N3
 startup.dataDirectory ~/.nyx
 



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

[tor-commits] [nyx/master] Drop torConfigDesc.txt

[atagar]

commit 77bb4e00098586698d897438f081b4781df722dd
Author: Damian Johnson 
Date:   Mon Mar 7 16:52:59 2016 -0800

Drop torConfigDesc.txt

Unused file. This was fallback tor manual information but stem now provides
this.
---
 README  |1 -
 nyx/resources/torConfigDesc.txt | 1123 ---
 2 files changed, 1124 deletions(-)

diff --git a/README b/README
index 8b79069..fb59185 100644
--- a/README
+++ b/README
@@ -170,7 +170,6 @@ Layout:
 version.py- version and last modified information
 test.py   - method for starting tests and demos
 settings.cfg  - attributes loaded for parsing tor related data
-torConfigDesc.txt - fallback descriptions of Tor's configuration options
 uninstall - removal script
 
 cli/
diff --git a/nyx/resources/torConfigDesc.txt b/nyx/resources/torConfigDesc.txt
deleted file mode 100644
index 9fa83e0..000
--- a/nyx/resources/torConfigDesc.txt
+++ /dev/null
@@ -1,1123 +0,0 @@
-Tor Version 0.2.2.13-alpha
-General
-index: 46
-acceldir
-DIR
-Specify this option if using dynamic hardware acceleration and the engine 
implementation library resides somewhere other than the OpenSSL default.
-
-General
-index: 45
-accelname
-NAME
-When using OpenSSL hardware crypto acceleration attempt to load the dynamic 
engine of this name. This must be used for any dynamic hardware engine. Names 
can be verified with the openssl engine command.
-
-Relay
-index: 119
-accountingmax
-N bytes|KB|MB|GB|TB
-Never send more than the specified number of bytes in a given accounting 
period, or receive more than that number in the period. For example, with 
AccountingMax set to 1 GB, a server could send 900 MB and receive 800 MB and 
continue running. It will only hibernate once one of the two reaches 1 GB. When 
the number of bytes is exhausted, Tor will hibernate until some time in the 
next accounting period. To prevent all servers from waking at the same time, 
Tor will also wait until a random point in each period before waking up. If you 
have bandwidth cost issues, enabling hibernation is preferable to setting a low 
bandwidth, since it provides users with a collection of fast servers that are 
up some of the time, which is more useful than a set of slow servers that are 
always "available".
-
-Relay
-index: 120
-accountingstart
-day|week|month [day] HH:MM
-Specify how long accounting periods last. If month is given, each accounting 
period runs from the time HH:MM on the dayth day of one month to the same day 
and time of the next. (The day must be between 1 and 28.) If week is given, 
each accounting period runs from the time HH:MM of the dayth day of one week to 
the same day and time of the next week, with Monday as day 1 and Sunday as day 
7. If day is given, each accounting period runs from the time HH:MM each day to 
the same time on the next day. All times are local, and given in 24-hour time. 
(Defaults to "month 1 0:00".)
-
-Relay
-index: 104
-address
-address
-The IP address or fully qualified domain name of this server (e.g. 
moria.mit.edu). You can leave this unset, and Tor will guess your IP address.
-
-Client
-index: 89
-allowdotexit
-0|1
-If enabled, we convert "www.google.com.foo.exit" addresses on the 
SocksPort/TransPort/NatdPort into "www.google.com" addresses that exit from the 
node "foo". Disabled by default since attacking websites and exit relays can 
use it to manipulate your path selection. (Default: 0)
-
-Client
-index: 51
-allowinvalidnodes
-entry|exit|middle|introduction|rendezvous|...
-If some Tor servers are obviously not working right, the directory authorities 
can manually mark them as invalid, meaning that it's not recommended you use 
them for entry or exit positions in your circuits. You can opt to use them in 
some circuit positions, though. The default is "middle,rendezvous", and other 
choices are not advised.
-
-Client
-index: 88
-allownonrfc953hostnames
-0|1
-When this option is disabled, Tor blocks hostnames containing illegal 
characters (like @ and :) rather than sending them to an exit node to be 
resolved. This helps trap accidental attempts to resolve URLs and so on. 
(Default: 0)
-
-Relay
-index: 105
-allowsinglehopexits
-0|1
-This option controls whether clients can use this server 

[tor-commits] [nyx/master] Header docs for our log.py util

[atagar]

commit 84a72df3ef57231fc6cc423f338b9c451f203df4
Author: Damian Johnson 
Date:   Mon Mar 7 13:42:58 2016 -0800

Header docs for our log.py util

Standard header summary for the functions provided by this module.
---
 nyx/util/log.py | 33 +
 1 file changed, 33 insertions(+)

diff --git a/nyx/util/log.py b/nyx/util/log.py
index 6c5a7b6..bf9fe82 100644
--- a/nyx/util/log.py
+++ b/nyx/util/log.py
@@ -1,6 +1,39 @@
 """
 Logging utilities, primiarily short aliases for logging a message at various
 runlevels.
+
+::
+
+  trace - logs a message at the TRACE runlevel 
+  debug - logs a message at the DEBUG runlevel
+  info - logs a message at the INFO runlevel
+  notice - logs a message at the NOTICE runlevel
+  warn - logs a message at the WARN runlevel
+  error - logs a message at the ERROR runlevel
+
+  day_count - number of days since a given timestamp
+  log_file_path - path of tor's log file if one is present on disk
+  condense_runlevels - condensed displayable listing of log events
+  listen_for_events - notifies listener of tor events
+  read_tor_log - provides LogEntry from a tor log file
+
+  LogGroup - thread safe, deduplicated grouping of events
+|- add - adds an event to the group
++- pop - removes and returns an event
+
+  LogEntry - individual log event
+|- is_duplicate_of - checks if a duplicate message of another LogEntry
++- day_count - number of days since this even occured
+
+  LogFileOutput - writes log events to a file
++- write - persist a given message
+
+  LogFilters - regex filtering of log events
+|- select - filters by this regex
+|- selection - current regex filter
+|- latest_selections - past regex selections
+|- match - checks if a LogEntry matches this filter
++- clone - deep clone of this LogFilters
 """
 
 import collections



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

[tor-commits] [nyx/master] Expand relative tor log paths

[atagar]

commit 44f8a618b145dc371b751f1d37e74a8fff258168
Author: Damian Johnson 
Date:   Mon Mar 7 13:24:03 2016 -0800

Expand relative tor log paths

We have an expand_path() helper so why not use it? We should now expand
relative tor log paths.
---
 nyx/util/log.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nyx/util/log.py b/nyx/util/log.py
index f9c95cc..6c5a7b6 100644
--- a/nyx/util/log.py
+++ b/nyx/util/log.py
@@ -25,7 +25,6 @@ except ImportError:
 
 TOR_RUNLEVELS = ['DEBUG', 'INFO', 'NOTICE', 'WARN', 'ERR']
 TIMEZONE_OFFSET = time.altzone if time.localtime()[8] else time.timezone
-CONFIG = stem.util.conf.config_dict('nyx', {'tor.chroot': ''})
 
 
 def day_count(timestamp):
@@ -55,7 +54,7 @@ def log_file_path(controller):
 entry_comp = log_entry.split()  # looking for an entry like: notice file 
/var/log/tor/notices.log
 
 if entry_comp[1] == 'file':
-  return CONFIG['tor.chroot'] + entry_comp[2]
+  return nyx.util.expand_path(entry_comp[2])
 
 
 @lru_cache()



___
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

[translation]

commit eec47b94fbf18c81d286611de937f617759c0222
Author: Translation commit bot 
Date:   Mon Mar 7 21:45:03 2016 +

Update translations for bridgedb
---
 be/LC_MESSAGES/bridgedb.po | 348 +++--
 1 file changed, 175 insertions(+), 173 deletions(-)

diff --git a/be/LC_MESSAGES/bridgedb.po b/be/LC_MESSAGES/bridgedb.po
index aba8259..8bb4e10 100644
--- a/be/LC_MESSAGES/bridgedb.po
+++ b/be/LC_MESSAGES/bridgedb.po
@@ -4,19 +4,21 @@
 # 
 # Translators:
 # Aleh Ladutska , 2014
+# Сілкін Станіслаў , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'POT-Creation-Date:
 2015-03-19 22:13+\n"
-"PO-Revision-Date: 2015-04-19 08:23+\n"
-"Last-Translator: runasand \n"
-"Language-Team: Belarusian 
(http://www.transifex.com/projects/p/torproject/language/be/)\n"
+"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+\n"
+"PO-Revision-Date: 2016-03-07 21:31+\n"
+"Last-Translator: Сілкін Станіслаў \n"
+"Language-Team: Belarusian 
(http://www.transifex.com/otf/torproject/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: be\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || 
(n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
@@ -29,57 +31,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Выбачайце! Штосьці пайшле не так пад 
час адпраўкі вашага запыта."
+msgstr "Выбачайце! Штосьці пайшло не так 
падчас адпраўкі вашага запыта."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Паведамiць пра баг."
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Зыходны Код"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Гісторыя зменаў"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Абраць Усё"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Паказаць QR-код"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Вой, божухна!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Здаецца, адбылася памылка падчас 
атрымання Вашага QR-кода."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "На дадзены момант няма даступных 
мастоў."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Магчыма, вам трэба паспрабаваць %s 
вярнуцца назад %s і абраць іншы тып маста."
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Крок %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Запампаваць %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Крок %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, 

[tor-commits] [stem/master] Use dirauth for last request

[atagar]

commit 3e0c2f4262d34939046d2f88af1dd0993cf2ef8d
Author: Damian Johnson 
Date:   Sun Mar 6 16:36:46 2016 -0800

Use dirauth for last request

When request descriptors we default to using a directory authority for our 
last
attempt if earlier tries failed. Mistakenly we were including fallback
directories in this final selection.
---
 stem/descriptor/remote.py | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py
index baba8ac..2374071 100644
--- a/stem/descriptor/remote.py
+++ b/stem/descriptor/remote.py
@@ -429,7 +429,12 @@ class Query(object):
 :returns: **str** for the url being queried by this request
 """
 
-if use_authority or not self.endpoints:
+if use_authority:
+  directories = get_authorities().values()
+
+  picked = random.choice(directories)
+  address, dirport = picked.address, picked.dir_port
+elif not self.endpoints:
   directories = get_authorities().values() + 
FallbackDirectory.from_cache().values()
 
   picked = random.choice(directories)



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

[tor-commits] [stem/master] test_shorthand_aliases integ test broken

[atagar]

commit e4dc4e7560cc980257fdd96ba9b58c326b138af6
Author: Damian Johnson 
Date:   Mon Mar 7 13:08:07 2016 -0800

test_shorthand_aliases integ test broken

Our unit tests caused us to cache a Mock object rather than a
DescriptorDownloader for our singleton. This in turn broke our later integ
tests...

  ==
  ERROR: test_shorthand_aliases
  --
  Traceback (most recent call last):
File "/home/atagar/Desktop/stem/test/runner.py", line 161, in wrapped
  return func(self, *args, **kwargs)
File "/home/atagar/Desktop/stem/test/runner.py", line 178, in wrapped
  return func(self, *args, **kwargs)
File "/home/atagar/Desktop/stem/test/integ/descriptor/remote.py", line 
31, in test_shorthand_aliases
  desc = 
list(stem.descriptor.remote.get_server_descriptors('9695DFC35FFEB861329B9F1AB04C46397020CE31').run())[0]
  IndexError: list index out of range
---
 test/unit/tutorial.py | 8 
 1 file changed, 8 insertions(+)

diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py
index 3c5bfd6..ac0bdd4 100644
--- a/test/unit/tutorial.py
+++ b/test/unit/tutorial.py
@@ -5,6 +5,8 @@ Tests for the examples given in stem's tutorial.
 import io
 import unittest
 
+import stem.descriptor.remote
+
 from stem.control import Controller
 from stem.descriptor.reader import DescriptorReader
 from stem.descriptor.server_descriptor import RelayDescriptor
@@ -38,6 +40,12 @@ MIRROR_MIRROR_OUTPUT = """\
 
 
 class TestTutorial(unittest.TestCase):
+  def tearDown(self):
+# Ensure we don't cache a Mock object as our downloader. Otherwise future
+# tests will understandably be very sad. :P
+
+stem.descriptor.remote.SINGLETON_DOWNLOADER = None
+
   @patch('sys.stdout', new_callable = StringIO)
   @patch('stem.control.Controller.from_port', spec = Controller)
   def test_the_little_relay_that_could(self, from_port_mock, stdout_mock):

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

[tor-commits] [stem/master] Don't use fallback directories when fetching descriptors

[atagar]

commit 758f632de2acc90bd0d7d1f1022624b723b288ae
Author: Damian Johnson 
Date:   Sun Mar 6 17:13:15 2016 -0800

Don't use fallback directories when fetching descriptors

Bah. Added fallback directories into our default pool to lessen load on
dirauths, but they can't serve extrainfo descriptors...

  https://trac.torproject.org/projects/tor/ticket/18489

This is usually fine for tor clients, but not for us.
---
 docs/change_log.rst   |  1 -
 stem/descriptor/remote.py | 11 +++
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index 3ce6df2..26e9966 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -61,7 +61,6 @@ The following are only available within Stem's `git repository
 
   * `Shorthand functions for stem.descriptor.remote 
`_
   * Added `fallback directory information 
`_.
-  * Lessened dirauth load of `stem.descriptor.remote 
`_ by using fallback directories as well
   * Support for ed25519 descriptor fields (:spec:`5a79d67`)
   * Server descriptor validation fails with 'extra-info-digest line had an 
invalid value' from additions in proposal 228 (:trac:`16227`)
   * :class:`~stem.descriptor.server_descriptor.BridgeDescriptor` now has 
'ntor_onion_key' like its unsanitized counterparts
diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py
index 2374071..09aba84 100644
--- a/stem/descriptor/remote.py
+++ b/stem/descriptor/remote.py
@@ -429,16 +429,11 @@ class Query(object):
 :returns: **str** for the url being queried by this request
 """
 
-if use_authority:
+if use_authority or not self.endpoints:
   directories = get_authorities().values()
 
   picked = random.choice(directories)
   address, dirport = picked.address, picked.dir_port
-elif not self.endpoints:
-  directories = get_authorities().values() + 
FallbackDirectory.from_cache().values()
-
-  picked = random.choice(directories)
-  address, dirport = picked.address, picked.dir_port
 else:
   address, dirport = random.choice(self.endpoints)
 
@@ -487,7 +482,7 @@ class DescriptorDownloader(object):
   def __init__(self, use_mirrors = False, **default_args):
 self._default_args = default_args
 
-directories = list(get_authorities().values()) + 
list(FallbackDirectory.from_cache().values())
+directories = list(get_authorities().values())
 self._endpoints = [(directory.address, directory.dir_port) for directory 
in directories]
 
 if use_mirrors:
@@ -509,7 +504,7 @@ class DescriptorDownloader(object):
 :raises: **Exception** if unable to determine the directory mirrors
 """
 
-directories = get_authorities().values() + 
FallbackDirectory.from_cache().values()
+directories = get_authorities().values()
 new_endpoints = set([(directory.address, directory.dir_port) for directory 
in directories])
 
 consensus = list(self.get_consensus(document_handler = 
stem.descriptor.DocumentHandler.DOCUMENT).run())[0]



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

[tor-commits] [stem/master] Key fallback directories on fingerprint

[atagar]

commit 9fa650f3e20508a366ce71333b96015c54d2d70d
Author: Damian Johnson 
Date:   Sun Mar 6 16:15:53 2016 -0800

Key fallback directories on fingerprint

Internal detail, but in our config file we keyed fallback directories on 
their
nickname. This made the config more readable but is a no-go since nicknames 
are
non-unique. At present tor has two Unnamed fallback directories and as a 
result
we could only have information about one.

This is all internal details. Only impact for users is that we're no longer
missing one of the fallbacks.
---
 cache_fallback_directories.py|  10 +-
 stem/descriptor/fallback_directories.cfg | 254 ---
 stem/descriptor/remote.py|  24 +--
 3 files changed, 146 insertions(+), 142 deletions(-)

diff --git a/cache_fallback_directories.py b/cache_fallback_directories.py
index d6a58a9..138f767 100755
--- a/cache_fallback_directories.py
+++ b/cache_fallback_directories.py
@@ -55,10 +55,10 @@ if __name__ == '__main__':
   conf.set('stem_commit', stem_commit)
 
   for directory in latest_fallback_directories.values():
-nickname = directory.nickname
-conf.set('%s.address' % nickname, directory.address)
-conf.set('%s.or_port' % nickname, str(directory.or_port))
-conf.set('%s.dir_port' % nickname, str(directory.dir_port))
-conf.set('%s.fingerprint' % nickname, directory.fingerprint)
+fingerprint = directory.fingerprint
+conf.set('%s.address' % fingerprint, directory.address)
+conf.set('%s.or_port' % fingerprint, str(directory.or_port))
+conf.set('%s.dir_port' % fingerprint, str(directory.dir_port))
+conf.set('%s.nickname' % fingerprint, directory.nickname)
 
   conf.save(stem.descriptor.remote.CACHE_PATH)
diff --git a/stem/descriptor/fallback_directories.cfg 
b/stem/descriptor/fallback_directories.cfg
index faf6105..d420fb5 100644
--- a/stem/descriptor/fallback_directories.cfg
+++ b/stem/descriptor/fallback_directories.cfg
@@ -1,126 +1,130 @@
 tor_commit e2202146d16af22502fd4166ac926fefa6528dff
-stem_commit 7fceffac0f988670f4fd6b5eb061b2ebeee9e560
-Doedel22.address 178.254.44.135
-Doedel22.or_port 9001
-Doedel22.dir_port 9030
-Doedel22.fingerprint 8FA37B93397015B2BC5A525C908485260BE9F422
-Logforme.address 84.219.173.60
-Logforme.or_port 443
-Logforme.dir_port 9030
-Logforme.fingerprint 855BC2DABE24C861CD887DB9B2E950424B49FC34
-Doedel21.address 178.254.44.135
-Doedel21.or_port 443
-Doedel21.dir_port 80
-Doedel21.fingerprint AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2
-kitten4.address 212.47.237.95
-kitten4.or_port 9101
-kitten4.dir_port 9130
-kitten4.fingerprint 6FB38EB22E57EF7ED5EF00238F6A48E553735D88
-kitten3.address 212.47.237.95
-kitten3.or_port 9001
-kitten3.dir_port 9030
-kitten3.fingerprint 3F5D8A879C58961BB45A3D26AC41B543B40236D6
-Unnamed.address 217.12.199.208
-Unnamed.or_port 443
-Unnamed.dir_port 80
-Unnamed.fingerprint DF3AED4322B1824BF5539AE54B2D1B38E080FF05
-coby.address 51.255.33.237
-coby.or_port 9001
-coby.dir_port 9091
-coby.fingerprint A360C21FA87FFA2046D92C17086A6B47E5C68109
-Binnacle.address 108.53.208.157
-Binnacle.or_port 443
-Binnacle.dir_port 80
-Binnacle.fingerprint 4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2
-fluxe3.address 78.47.18.110
-fluxe3.or_port 80
-fluxe3.dir_port 443
-fluxe3.fingerprint F8D27B163B9247B232A2EEE68DD8B698695C28DE
-rueckgrat.address 5.9.110.236
-rueckgrat.or_port 9001
-rueckgrat.dir_port 9030
-rueckgrat.fingerprint 0756B7CD4DFC8182BE23143FAC0642F515182CEB
-Nurnberg01.address 213.239.210.204
-Nurnberg01.or_port 443
-Nurnberg01.dir_port 22
-Nurnberg01.fingerprint 5BFDECCE9B4A23AE14EC767C5A2C1E10558B00B9
-wagner.address 5.175.233.86
-wagner.or_port 443
-wagner.dir_port 80
-wagner.fingerprint 5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33
-kitten2.address 62.210.124.124
-kitten2.or_port 9101
-kitten2.dir_port 9130
-kitten2.fingerprint 2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E
-Nurnberg02.address 213.239.220.25
-Nurnberg02.or_port 443
-Nurnberg02.dir_port 22
-Nurnberg02.fingerprint BEE2317AE127EB681C5AE1551C1EA0630580638A
-eriador.address 85.25.138.93
-eriador.or_port 4029
-eriador.dir_port 9030
-eriador.fingerprint 6DE61A6F72C1E5418A66BFED80DFB63E4C77668F
-Doedel26.address 178.254.20.134
-Doedel26.or_port 443
-Doedel26.dir_port 80
-Doedel26.fingerprint 9F5068310818ED7C70B0BC4087AB55CB12CB4377
-kitten1.address 62.210.124.124
-kitten1.or_port 9001
-kitten1.dir_port 9030
-kitten1.fingerprint 86E78DD3720C78DA8673182EF96C54B162CD660C
-bakunin.address 178.16.208.57
-bakunin.or_port 443
-bakunin.dir_port 80
-bakunin.fingerprint 92CFD9565B24646CAC2D172D3DB503D69E777B8A
-PedicaboMundi.address 144.76.14.145
-PedicaboMundi.or_port 143
-PedicaboMundi.dir_port 110
-PedicaboMundi.fingerprint 14419131033443AE6E21DA82B0D307F7CAE42BDB
-tornoderdednl.address 178.62.199.226
-tornoderdednl.or_port 443
-tornoderdednl.dir_port 80
-tornoderdednl.fingerprint CBEFF7BA4A4062045133C053F2D70524D8BBE5BE
-ratchet.address 170.130.1.7

[tor-commits] [stem/master] Deprecated the DescriptorDownloader's get_microdescriptors()

[atagar]

commit 2860a3f66bc59a8f33223980fa79046ce5dcdd0b
Author: Damian Johnson 
Date:   Sun Mar 6 17:29:11 2016 -0800

Deprecated the DescriptorDownloader's get_microdescriptors()

This methed never worked since it was never actually implemented in tor...

  https://trac.torproject.org/projects/tor/ticket/9271
---
 docs/change_log.rst |  1 +
 stem/descriptor/remote.py   | 19 ---
 test/integ/descriptor/remote.py | 40 ++--
 3 files changed, 7 insertions(+), 53 deletions(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index 26e9966..a414835 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -69,6 +69,7 @@ The following are only available within Stem's `git repository
   * TypeError under python3 when using 'use_mirrors = True' (:trac:`17083`)
   * Deprecated hidden service descriptor's *introduction_points_auth* field, 
which was never implemented in tor (:trac:`15190`, :spec:`9c218f9`)
   * :func:`~stem.control.Controller.get_hidden_service_descriptor` errored 
when provided a *servers* argument (:trac:`18401`)
+  * Deprecated 
:func:`~stem.descriptor.remote.DescriptorDownloader.get_microdescriptors` as it 
was never implemented in tor (:trac:`9271`)
   * Fixed parsing of server descriptor's *allow-single-hop-exits* and 
*caches-extra-info* lines
   * Bracketed IPv6 addresses were mistreated as being invalid content
   * Updated dannenberg's v3ident (:trac:`17906`)
diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py
index 09aba84..859eb24 100644
--- a/stem/descriptor/remote.py
+++ b/stem/descriptor/remote.py
@@ -47,7 +47,6 @@ content. For example...
   get_instance - Provides a singleton DescriptorDownloader used for...
 |- get_server_descriptors - provides present server descriptors
 |- get_extrainfo_descriptors - provides present extrainfo descriptors
-|- get_microdescriptors - provides present microdescriptors
 +- get_consensus - provides the present consensus or router status entries
 
   get_authorities - Provides tor directory information.
@@ -66,7 +65,6 @@ content. For example...
 |- use_directory_mirrors - use directory mirrors to download future 
descriptors
 |- get_server_descriptors - provides present server descriptors
 |- get_extrainfo_descriptors - provides present extrainfo descriptors
-|- get_microdescriptors - provides present microdescriptors
 |- get_consensus - provides the present consensus or router status entries
 |- get_key_certificates - provides present authority key certificates
 +- query - request an arbitrary descriptor resource
@@ -123,7 +121,6 @@ def get_instance():
 
 * :func:`stem.descriptor.remote.get_server_descriptors`
 * :func:`stem.descriptor.remote.get_extrainfo_descriptors`
-* :func:`stem.descriptor.remote.get_microdescriptors`
 * :func:`stem.descriptor.remote.get_consensus`
 
   .. versionadded:: 1.5.0
@@ -163,18 +160,6 @@ def get_extrainfo_descriptors(fingerprints = None, 
**query_args):
   return get_instance().get_extrainfo_descriptors(fingerprints, **query_args)
 
 
-def get_microdescriptors(hashes, **query_args):
-  """
-  Shorthand for
-  :func:`~stem.descriptor.remote.DescriptorDownloader.get_microdescriptors`
-  on our singleton instance.
-
-  .. versionadded:: 1.5.0
-  """
-
-  return get_instance().get_microdescriptors(hashes, **query_args)
-
-
 def get_consensus(authority_v3ident = None, **query_args):
   """
   Shorthand for
@@ -587,6 +572,10 @@ class DescriptorDownloader(object):
 that these are only provided via a microdescriptor consensus (such as
 'cached-microdesc-consensus' in your data directory).
 
+.. deprecated:: 1.5.0
+   This function has never worked, as it was never implemented in tor
+   (:trac:`9271`).
+
 :param str,list hashes: microdescriptor hash or list of hashes to be
   retrieved
 :param query_args: additional arguments for the
diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py
index ef556ae..5fe6cc1 100644
--- a/test/integ/descriptor/remote.py
+++ b/test/integ/descriptor/remote.py
@@ -6,12 +6,10 @@ import unittest
 
 import stem.descriptor
 import stem.descriptor.extrainfo_descriptor
-import stem.descriptor.microdescriptor
 import stem.descriptor.networkstatus
 import stem.descriptor.remote
 import stem.descriptor.router_status_entry
 import stem.descriptor.server_descriptor
-import test.runner
 
 from test.runner import (
   require_online,
@@ -28,15 +26,12 @@ class TestDescriptorDownloader(unittest.TestCase):
 descriptors.
 """
 
-desc = 
list(stem.descriptor.remote.get_server_descriptors('9695DFC35FFEB861329B9F1AB04C46397020CE31'))[0]
+desc = 
list(stem.descriptor.remote.get_server_descriptors('9695DFC35FFEB861329B9F1AB04C46397020CE31').run())[0]
 self.assertEqual('moria1', desc.nickname)
 
-desc = 

[tor-commits] [tor-messenger-build/master] Add a tor-messenger-release makefile rule

[boklm]

commit be9a70bbc271a0d5eba080c49694b6477c6e31a0
Author: Nicolas Vigier 
Date:   Mon Mar 7 19:45:36 2016 +0100

Add a tor-messenger-release makefile rule

This rule will build Tor Messenger for all platforms, rename files to
their final name and generate an sha256sums.txt file.
---
 Makefile  |  3 +++
 README|  4 
 projects/tor-messenger-release/config | 43 +++
 3 files changed, 50 insertions(+)

diff --git a/Makefile b/Makefile
index f203ea5..0e539d1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,9 @@ all: tor-messenger
 
 tor-messenger: tor-messenger-linux-x86_64 tor-messenger-linux-i686 
tor-messenger-windows-i686 tor-messenger-osx-x86_64
 
+tor-messenger-release:
+   $(rbm) build tor-messenger-release
+
 tor-mail: tor-mail-linux-x86_64 tor-mail-linux-i686
 
 tor-messenger-linux-x86_64: submodule-update
diff --git a/README b/README
index cc09732..6b4a642 100644
--- a/README
+++ b/README
@@ -52,6 +52,10 @@ If you want to build only one architecture, you can run 
something like
 
 The resulting builds are stored in the out/tor-messenger directory.
 
+You can also run "make tor-messenger-release" to build it for all
+architectures, rename files to their final name and generate an
+sha256sums.txt file in the directory release/$version.
+
 
 Updating git and hg sources
 ---
diff --git a/projects/tor-messenger-release/config 
b/projects/tor-messenger-release/config
new file mode 100644
index 000..87185ca
--- /dev/null
+++ b/projects/tor-messenger-release/config
@@ -0,0 +1,43 @@
+# vim: filetype=yaml sw=2
+version: '[% c("var/tormessenger_version") %]'
+output_dir: 'release'
+
+input_files:
+
+ - name: linux-x86_64
+   project: tor-messenger
+   target:
+ - tor-messenger
+ - linux-x86_64
+
+ - name: linux-i686
+   project: tor-messenger
+   target:
+ - tor-messenger
+ - linux-i686
+
+ - name: windows-i686
+   project: tor-messenger
+   target:
+ - tor-messenger
+ - windows-i686
+
+ - name: osx-x86_64
+   project: tor-messenger
+   target:
+ - tor-messenger
+ - osx-x86_64
+
+build: |
+  #!/bin/sh
+  set -e
+  export LC_ALL=C
+  destdir="[% dest_dir _ '/' _ c("version") %]"
+  mkdir -p "$destdir"
+  mv [% c('input_files_by_name/linux-x86_64') %] 
"$destdir"/tor-messenger-linux64-[% c("version") %]_en-US.tar.xz
+  mv [% c('input_files_by_name/linux-i686') %] 
"$destdir"/tor-messenger-linux32-[% c("version") %]_en-US.tar.xz
+  mv [% c('input_files_by_name/windows-i686') %] 
"$destdir"/tormessenger-install-[% c("version") %]_en-US.exe
+  mv [% c('input_files_by_name/osx-x86_64') %] "$destdir"/TorMessenger-[% 
c("version") %]-osx64_en-US.dmg
+  cd "$destdir"
+  sha256sum $(ls -1 *.exe *.tar.xz *.dmg | sort) > sha256sums.txt
+  cat sha256sums.txt

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

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

[translation]

commit e241df9f2bcd1524836208a84d89272289d5a8c6
Author: Translation commit bot 
Date:   Mon Mar 7 20:45:50 2016 +

Update translations for tails-misc_completed
---
 fr.po | 82 +--
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/fr.po b/fr.po
index 8bf3022..606c792 100644
--- a/fr.po
+++ b/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 21:00+0100\n"
-"PO-Revision-Date: 2016-01-19 20:39+\n"
+"POT-Creation-Date: 2016-02-24 21:38+0100\n"
+"PO-Revision-Date: 2016-03-07 20:34+\n"
 "Last-Translator: Towinet\n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -56,30 +56,30 @@ msgid ""
 "\n"
 msgstr "Aidez-nous à corriger votre bogue !\nLisez nos instructions de rapport de bogue.\nN'incluez 
pas plus d'informations personnelles que nécessaire !\nNous 
donner une adresse courriel\n\nNous donner une adresse courriel nous 
permet de vous contacter pour clarifier le problème.\nCeci est nécessaire 
pour la vaste majorité des rapports que nous recevons car la\nplupart des 
rapports sans information de contact sont inutiles. D'un autre côté,\ncela 
donne l'occasion aux oreilles électroniques indiscrètes, comme votre 
fournisseur\nde service Internet ou de courriel, de confirmer que vous utilisez 
Tails.\n\n"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:14
+#: config/chroot_local-includes/usr/local/bin/electrum:17
 msgid "Persistence is disabled for Electrum"
 msgstr "La persistance est désactivée pour Electrum"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:16
+#: config/chroot_local-includes/usr/local/bin/electrum:19
 msgid ""
 "When you reboot Tails, all of Electrum's data will be lost, including your "
 "Bitcoin wallet. It is strongly recommended to only run Electrum when its "
 "persistence feature is activated."
 msgstr "Lorsque vous redémarrez Tails, toutes les données d'Electrum sont 
perdues, y compris votre portefeuille Bitcoin. Il est fortement recommandé de 
n'exécuter Electrum que lorsque la fonction persistance est activée."
 
-#: config/chroot_local-includes/usr/local/bin/electrum:18
+#: config/chroot_local-includes/usr/local/bin/electrum:21
 msgid "Do you want to start Electrum anyway?"
 msgstr "Voulez-vous démarrer Electrum malgré tout ?"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:20
-#: config/chroot_local-includes/usr/local/bin/icedove:22
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36
+#: config/chroot_local-includes/usr/local/bin/electrum:23
+#: config/chroot_local-includes/usr/local/bin/icedove:23
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Lancer"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:21
-#: config/chroot_local-includes/usr/local/bin/icedove:23
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/bin/electrum:24
+#: config/chroot_local-includes/usr/local/bin/icedove:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Sortir"
 
@@ -240,11 +240,11 @@ msgstr "Voici la sortie de GnuPG :"
 msgid "Other messages provided by GnuPG:"
 msgstr "Autres messages fournis par GnuPG :"
 
-#: config/chroot_local-includes/usr/local/bin/icedove:18
+#: config/chroot_local-includes/usr/local/bin/icedove:19
 msgid "The Claws Mail persistence feature is activated."
 msgstr "La fonctionnalité persistance de Claws Mail est activée."
 
-#: config/chroot_local-includes/usr/local/bin/icedove:20
+#: config/chroot_local-includes/usr/local/bin/icedove:21
 msgid ""
 "If you have emails saved in Claws Mail, you should migrate"
@@ -325,40 +325,40 @@ msgstr "Cette version de Tails a des problèmes de 
sécurité avérés :"
 msgid "Known security issues"
 msgstr "Problèmes de sécurité connus"
 
-#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
 #, sh-format
 msgid "Network card ${nic} disabled"
 msgstr "Carte réseau ${nic} désactivée"
 
-#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53
 #, sh-format
 msgid ""
 "MAC spoofing failed for network card ${nic_name} (${nic}) so it is 
temporarily disabled.\n"
 "You might prefer to restart Tails and disable MAC spoofing."
 msgstr "L'usurpation MAC a échoué pour la carte réseau ${nic_name} 
(${nic}), cette fonctionnalité est donc temporairement désactivée.\nVous 
pouvez néanmoins redémarrer Tails et désactiver complètement la 
fonctionnalité d'usurpation MAC."
 
-#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62
 

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

[translation]

commit bf0decd14d5787a554e6d87b17bfe3d45c370082
Author: Translation commit bot 
Date:   Mon Mar 7 20:45:46 2016 +

Update translations for tails-misc
---
 fr.po | 82 +--
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/fr.po b/fr.po
index 8bf3022..606c792 100644
--- a/fr.po
+++ b/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 21:00+0100\n"
-"PO-Revision-Date: 2016-01-19 20:39+\n"
+"POT-Creation-Date: 2016-02-24 21:38+0100\n"
+"PO-Revision-Date: 2016-03-07 20:34+\n"
 "Last-Translator: Towinet\n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -56,30 +56,30 @@ msgid ""
 "\n"
 msgstr "Aidez-nous à corriger votre bogue !\nLisez nos instructions de rapport de bogue.\nN'incluez 
pas plus d'informations personnelles que nécessaire !\nNous 
donner une adresse courriel\n\nNous donner une adresse courriel nous 
permet de vous contacter pour clarifier le problème.\nCeci est nécessaire 
pour la vaste majorité des rapports que nous recevons car la\nplupart des 
rapports sans information de contact sont inutiles. D'un autre côté,\ncela 
donne l'occasion aux oreilles électroniques indiscrètes, comme votre 
fournisseur\nde service Internet ou de courriel, de confirmer que vous utilisez 
Tails.\n\n"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:14
+#: config/chroot_local-includes/usr/local/bin/electrum:17
 msgid "Persistence is disabled for Electrum"
 msgstr "La persistance est désactivée pour Electrum"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:16
+#: config/chroot_local-includes/usr/local/bin/electrum:19
 msgid ""
 "When you reboot Tails, all of Electrum's data will be lost, including your "
 "Bitcoin wallet. It is strongly recommended to only run Electrum when its "
 "persistence feature is activated."
 msgstr "Lorsque vous redémarrez Tails, toutes les données d'Electrum sont 
perdues, y compris votre portefeuille Bitcoin. Il est fortement recommandé de 
n'exécuter Electrum que lorsque la fonction persistance est activée."
 
-#: config/chroot_local-includes/usr/local/bin/electrum:18
+#: config/chroot_local-includes/usr/local/bin/electrum:21
 msgid "Do you want to start Electrum anyway?"
 msgstr "Voulez-vous démarrer Electrum malgré tout ?"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:20
-#: config/chroot_local-includes/usr/local/bin/icedove:22
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36
+#: config/chroot_local-includes/usr/local/bin/electrum:23
+#: config/chroot_local-includes/usr/local/bin/icedove:23
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Lancer"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:21
-#: config/chroot_local-includes/usr/local/bin/icedove:23
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/bin/electrum:24
+#: config/chroot_local-includes/usr/local/bin/icedove:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Sortir"
 
@@ -240,11 +240,11 @@ msgstr "Voici la sortie de GnuPG :"
 msgid "Other messages provided by GnuPG:"
 msgstr "Autres messages fournis par GnuPG :"
 
-#: config/chroot_local-includes/usr/local/bin/icedove:18
+#: config/chroot_local-includes/usr/local/bin/icedove:19
 msgid "The Claws Mail persistence feature is activated."
 msgstr "La fonctionnalité persistance de Claws Mail est activée."
 
-#: config/chroot_local-includes/usr/local/bin/icedove:20
+#: config/chroot_local-includes/usr/local/bin/icedove:21
 msgid ""
 "If you have emails saved in Claws Mail, you should migrate"
@@ -325,40 +325,40 @@ msgstr "Cette version de Tails a des problèmes de 
sécurité avérés :"
 msgid "Known security issues"
 msgstr "Problèmes de sécurité connus"
 
-#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
 #, sh-format
 msgid "Network card ${nic} disabled"
 msgstr "Carte réseau ${nic} désactivée"
 
-#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53
 #, sh-format
 msgid ""
 "MAC spoofing failed for network card ${nic_name} (${nic}) so it is 
temporarily disabled.\n"
 "You might prefer to restart Tails and disable MAC spoofing."
 msgstr "L'usurpation MAC a échoué pour la carte réseau ${nic_name} 
(${nic}), cette fonctionnalité est donc temporairement désactivée.\nVous 
pouvez néanmoins redémarrer Tails et désactiver complètement la 
fonctionnalité d'usurpation MAC."
 
-#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62
 msgid "All 

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

[translation]

commit feb0f0dc0c11e5ca625df93408d096d6f402f99a
Author: Translation commit bot 
Date:   Mon Mar 7 20:45:15 2016 +

Update translations for https_everywhere
---
 fr/https-everywhere.dtd | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd
index 6e2578c..c3a38b0 100644
--- a/fr/https-everywhere.dtd
+++ b/fr/https-everywhere.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 
@@ -42,15 +42,15 @@
 
 
 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 
-
-
+
+
 
 

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

[tor-commits] [webwml/master] Replace Solr with Elasticsearch for Ahmia

[atagar]

commit c5206db81638fc61b46a51674652f2a66b4b6042
Author: Damian Johnson 
Date:   Mon Mar 7 11:53:04 2016 -0800

Replace Solr with Elasticsearch for Ahmia

Oops, missed a requested edit.
---
 getinvolved/en/volunteer.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 27db957..21f199e 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -1390,7 +1390,7 @@ implementation.
   Improving the search results (very important)
 
   Tweaking search algorithms
-  Adjust Apache Solr
+  Adjust Elasticsearch
   Enrich the data that is used to rank the search results
 
   

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

[tor-commits] [webwml/master] Add 'Ahmia - Hidden Service Search' back to the page

[atagar]

commit 6eb4e40e209cea8b7a873649f402cc0fe4aae2b6
Author: Damian Johnson 
Date:   Mon Mar 7 11:49:17 2016 -0800

Add 'Ahmia - Hidden Service Search' back to the page

Oops, removing this was my bad. Juha asked for this to be added back and 
George
has volunteered as the backup mentor.
---
 getinvolved/en/volunteer.wml | 65 
 1 file changed, 65 insertions(+)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 0bfe429..27db957 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -1352,6 +1352,71 @@ implementation.
 
 
 
+
+
+Ahmia - Hidden Service Search
+
+Language: Python, Django
+
+Likely Mentors: Juha Nurmi (numes), George (asn)
+
+
+Ahmia is open-source search engine software for Tor hidden service deep
+dark web sites. You can test the running search engine at ahmia.fi. For
+more information see our https://blog.torproject.org/category/tags/ahmiafi;>blog post about
+Ahmia's GSoC2014 development.
+
+
+
+Ahmia is a working search engine that indexes, searches, and catalogs
+content published on Tor Hidden Services. Furthermore, it is an environment
+to share meaningful insights, statistics, insights, and news about the Tor
+network itself. In this context, there is a lot of work to do.
+
+
+
+The Ahmia web service is written using the Django web framework. As a
+result, the server-side language is Python. On the client-side, most of the
+pages are plain HTML. There are some pages that require JavaScript, but the
+search itself works without client-side JavaScript.
+
+
+
+There are several possible directions for this project, including...
+
+
+
+  Improving the search results (very important)
+
+  Tweaking search algorithms
+  Adjust Apache Solr
+  Enrich the data that is used to rank the search results
+
+  
+  Improving UX and UI (very important)
+
+  Showing relevant knowledge
+  Design the navigation and information architecture
+  HTML5, CSS and Django development
+
+  
+  Review code and infrastructure
+
+  Review code and fix bugs
+  Writing Django test cases
+  Linux configurations, automatizations
+
+  
+  Gather statistics over time and publish them
+
+  Gather different kind of stats about Hidden Services
+  Publish these stats using HTTP REST API
+  Using this API show meaningful tables, charts and 
visualizations
+
+  
+
+
 

[tor-commits] [webwml/master] Note Marcela's irc nick

[atagar]

commit 2b5d1b53b4eae8f222d1aa85f51b00b1a37c362b
Author: Damian Johnson 
Date:   Mon Mar 7 11:21:25 2016 -0800

Note Marcela's irc nick

She's available on irc for students, so letting 'em know who to contact.
---
 getinvolved/en/volunteer.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 5efa81b..0bfe429 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -1095,7 +1095,7 @@ get ya started...
 
 Language: C, JavaScript
 
-Likely Mentors: Marcela, Arlo (arlolra)
+Likely Mentors: Marcela (masomel), Arlo (arlolra)
 
 
 CONIKS is an end-user key management and verification system for end-to-end

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

[tor-commits] [tor/master] 0.2.5.12 got left out of the changelog somehow

[arma]

commit 63b4ce1f7e7e87e51c840bd0cc736e66d08aa92f
Author: Roger Dingledine 
Date:   Mon Mar 7 13:05:40 2016 -0500

0.2.5.12 got left out of the changelog somehow
---
 ChangeLog | 24 
 1 file changed, 24 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6ab821f..c39ea19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1400,6 +1400,30 @@ Changes in version 0.2.4.27 - 2015-04-06
   Resolves ticket 15515.
 
 
+Changes in version 0.2.5.12 - 2015-04-06
+  Tor 0.2.5.12 backports two fixes from 0.2.6.7 for security issues that
+  could be used by an attacker to crash hidden services, or crash clients
+  visiting hidden services. Hidden services should upgrade as soon as
+  possible; clients should upgrade whenever packages become available.
+
+  This release also backports a simple improvement to make hidden
+  services a bit less vulnerable to denial-of-service attacks.
+
+  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 "disgleirio".
+- 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 "DonnchaC".
+
+  o Minor features (DoS-resistance, hidden service):
+- Introduction points no longer allow multiple INTRODUCE1 cells to
+  arrive on the same circuit. This should make it more expensive for
+  attackers to overwhelm hidden services with introductions.
+  Resolves ticket 15515.
+
+
 Changes in version 0.2.6.7 - 2015-04-06
   Tor 0.2.6.7 fixes two security issues that could be used by an
   attacker to crash hidden services, or crash clients visiting hidden

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

[tor-commits] [tor-browser-bundle/hardened-builds] Release preparations for 6.0a3-hardened

[gk]

commit b6e860d97f33234e0234d1e60588375dd256a090
Author: Georg Koppen 
Date:   Mon Mar 7 08:04:22 2016 +

Release preparations for 6.0a3-hardened
---
 Bundle-Data/Docs/ChangeLog.txt| 20 
 gitian/versions.alpha | 16 
 tools/update-responses/config.yml | 12 ++--
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index d115483..2278042 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,23 @@
+Tor Browser 6.0a3-hardened -- March 8
+ * All Platforms
+   * Update Firefox to 38.7.0esr
+   * Update Tor to 0.2.8.1-alpha
+   * Update OpenSSL to 1.0.1s
+   * Update NoScript to 2.9.0.4
+   * Update HTTPS Everywhere to 5.1.4
+   * Update Torbutton to 1.9.5.1
+ * Bug 16990: Don't mishandle multiline commands
+ * Bug 18144: about:tor update arrow position is wrong
+ * Bug 16725: Allow resizing with non-default homepage
+ * Bug 16917: Allow users to more easily set a non-tor SSH proxy
+ * Translation updates
+   * Bug 18030: Isolate favicon requests on Page Info dialog
+   * Bug 18297: Use separate Noto JP,KR,SC,TC fonts
+   * Bug 18170: Make sure the homepage is shown after an update as well
+   * Bug 16728: Add test cases for favicon isolation
+ * Windows
+   * Bug 18292: Disable staged updates on Windows
+
 Tor Browser 6.0a2-hardened -- February 15 2016
  * All Platforms
* Update Firefox to 38.6.1esr
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 0ddaa65..b46c736 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -11,15 +11,15 @@ MULTI_LINGUAL=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=38.6.1esr
+FIREFOX_VERSION=38.7.0esr
 
 TORBROWSER_UPDATE_CHANNEL=hardened
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1
-TOR_TAG=tor-0.2.7.6
+TOR_TAG=tor-0.2.8.1-alpha
 TORLAUNCHER_TAG=0.2.8.3
-TORBUTTON_TAG=1.9.5
-HTTPSE_TAG=5.1.2
+TORBUTTON_TAG=1.9.5.1
+HTTPSE_TAG=5.1.4
 NSIS_TAG=v0.3.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.22-stable
@@ -42,7 +42,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2
 
 GITIAN_TAG=tor-browser-builder-3.x-9
 
-OPENSSL_VER=1.0.1q
+OPENSSL_VER=1.0.1s
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
 FIREFOX_LANG_BUILD=build1
@@ -62,7 +62,7 @@ GO_VER=1.4.2
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.3-fx+fn+sm.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
@@ -88,13 +88,13 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf
 NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf
 
 # Hashes for packages with weak sigs or no sigs
-OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7
+OPENSSL_HASH=e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511
 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
 
OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9
+NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
diff --git a/tools/update-responses/config.yml 
b/tools/update-responses/config.yml
index 7b59296..2c9e0a8 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -9,7 +9,7 @@ build_targets:
 osx32: Darwin_x86-gcc3
 osx64: Darwin_x86_64-gcc3
 channels:
-hardened: 6.0a2-hardened
+hardened: 6.0a3-hardened
 release: 5.0
 versions:
 5.0:
@@ -23,12 +23,12 @@ versions:
 osx32:
 minSupportedOSVersion: 10.8
 detailsURL: 
https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#updating
-6.0a2-hardened:
-platformVersion: 38.6.1
-detailsURL: 
https://blog.torproject.org/blog/tor-browser-60a2-hardened-released
-download_url: https://www.torproject.org/dist/torbrowser/6.0a2-hardened
+6.0a3-hardened:
+platformVersion: 38.7.0
+detailsURL: 
https://blog.torproject.org/blog/tor-browser-60a3-hardened-released
+download_url: https://www.torproject.org/dist/torbrowser/6.0a3-hardened
 

[tor-commits] [tor-browser-bundle/hardened-builds] Add new HTTPS-Everywhere signing key

[gk]

commit 5815dec2134713a88833578ef6a6b5ab2ebcbc47
Author: Georg Koppen 
Date:   Fri Mar 4 11:55:59 2016 +

Add new HTTPS-Everywhere signing key
---
 gitian/gpg/https-everywhere.gpg | Bin 188424 -> 194393 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg
index 43aa4e4..fdd8d4f 100644
Binary files a/gitian/gpg/https-everywhere.gpg and 
b/gitian/gpg/https-everywhere.gpg differ



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