[tor-commits] [snowflake/master] Call explicit frees in server-webrtc.

[arlo]

commit c834c76fc50677cfb98e516e5d9d630ecfe691c2
Author: David Fifield 
Date:   Mon Mar 12 19:59:21 2018 -0700

Call explicit frees in server-webrtc.

https://bugs.torproject.org/21312

Cf. corresponding change for proxy-go:

https://gitweb.torproject.org/pluggable-transports/snowflake.git/commit/?id=ff8f3851082e8f7f8b4c8b99b161be35020aeb67
---
 server-webrtc/snowflake.go | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/server-webrtc/snowflake.go b/server-webrtc/snowflake.go
index b95829d..82b6afe 100644
--- a/server-webrtc/snowflake.go
+++ b/server-webrtc/snowflake.go
@@ -52,12 +52,14 @@ func (c *webRTCConn) Read(b []byte) (int, error) {
 func (c *webRTCConn) Write(b []byte) (int, error) {
// log.Printf("webrtc Write %d %+q", len(b), string(b))
log.Printf("Write %d bytes --> WebRTC", len(b))
-   c.dc.Send(b)
+   if c.dc != nil {
+   c.dc.Send(b)
+   }
return len(b), nil
 }
 
 func (c *webRTCConn) Close() error {
-   return c.pc.Close()
+   return c.pc.Destroy()
 }
 
 func (c *webRTCConn) LocalAddr() net.Addr {
@@ -121,12 +123,16 @@ func makePeerConnectionFromOffer(sdp 
*webrtc.SessionDescription, config *webrtc.
 
pr, pw := io.Pipe()
 
+   conn := {pc: pc, dc: dc, pr: pr}
+
dc.OnOpen = func() {
log.Println("OnOpen channel")
}
dc.OnClose = func() {
log.Println("OnClose channel")
pw.Close()
+   conn.dc = nil
+   pc.DeleteDataChannel(dc)
}
dc.OnMessage = func(msg []byte) {
log.Printf("OnMessage <--- %d bytes", len(msg))
@@ -139,13 +145,12 @@ func makePeerConnectionFromOffer(sdp 
*webrtc.SessionDescription, config *webrtc.
}
}
 
-   conn := {pc: pc, dc: dc, pr: pr}
go datachannelHandler(conn)
}
 
err = pc.SetRemoteDescription(sdp)
if err != nil {
-   pc.Close()
+   pc.Destroy()
return nil, fmt.Errorf("accept: SetRemoteDescription: %s", err)
}
log.Println("sdp offer successfully received.")
@@ -167,11 +172,11 @@ func makePeerConnectionFromOffer(sdp 
*webrtc.SessionDescription, config *webrtc.
// Wait until answer is ready.
select {
case err = <-errChan:
-   pc.Close()
+   pc.Destroy()
return nil, err
case _, ok := <-answerChan:
if !ok {
-   pc.Close()
+   pc.Destroy()
return nil, fmt.Errorf("Failed gathering ICE 
candidates.")
}
}



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

[tor-commits] [snowflake/master] Try to protect against crash from dereferencing a NULL in go-proxy

[arlo]

commit f2abf5b60c289103d8661b8e54b3d3aee43a4aaf
Author: Arlo Breault 
Date:   Wed Mar 14 00:15:13 2018 -0400

Try to protect against crash from dereferencing a NULL in go-proxy

Follow up to ff8f385

Similar to c834c76
---
 proxy-go/snowflake.go | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go
index b3b97b3..a12cfb2 100644
--- a/proxy-go/snowflake.go
+++ b/proxy-go/snowflake.go
@@ -71,7 +71,9 @@ func (c *webRTCConn) Read(b []byte) (int, error) {
 func (c *webRTCConn) Write(b []byte) (int, error) {
// log.Printf("webrtc Write %d %+q", len(b), string(b))
log.Printf("Write %d bytes --> WebRTC", len(b))
-   c.dc.Send(b)
+   if c.dc != nil {
+   c.dc.Send(b)
+   }
return len(b), nil
 }
 
@@ -254,12 +256,15 @@ func makePeerConnectionFromOffer(sdp 
*webrtc.SessionDescription, config *webrtc.
 
pr, pw := io.Pipe()
 
+   conn := {pc: pc, dc: dc, pr: pr}
+
dc.OnOpen = func() {
log.Println("OnOpen channel")
}
dc.OnClose = func() {
log.Println("OnClose channel")
pw.Close()
+   conn.dc = nil
pc.DeleteDataChannel(dc)
}
dc.OnMessage = func(msg []byte) {
@@ -273,7 +278,6 @@ func makePeerConnectionFromOffer(sdp 
*webrtc.SessionDescription, config *webrtc.
}
}
 
-   conn := {pc: pc, dc: dc, pr: pr}
go datachannelHandler(conn, conn.RemoteAddr())
}
 

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

[tor-commits] [snowflake/master] Allow broker base url to have a path

[arlo]

commit 42ec097a58cd7a0bf9a6d2e24fe9beeec689c0f4
Author: Arlo Breault 
Date:   Tue Mar 13 16:03:19 2018 -0400

Allow broker base url to have a path
---
 proxy-go/snowflake.go | 22 ++
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go
index debe23c..b3b97b3 100644
--- a/proxy-go/snowflake.go
+++ b/proxy-go/snowflake.go
@@ -26,7 +26,7 @@ const defaultBrokerURL = "https://snowflake-reg.appspot.com/;
 const defaultRelayURL = "wss://snowflake.bamsoftware.com/"
 const defaultSTUNURL = "stun:stun.l.google.com:19302"
 
-var brokerURL string
+var brokerURL *url.URL
 var relayURL string
 
 const (
@@ -121,18 +121,8 @@ func genSessionID() string {
return strings.TrimRight(base64.StdEncoding.EncodeToString(buf), "=")
 }
 
-// Parses a URL with url.Parse and panics on any error.
-func mustParseURL(rawurl string) *url.URL {
-   u, err := url.Parse(rawurl)
-   if err != nil {
-   panic(err)
-   }
-   return u
-}
-
 func pollOffer(sid string) *webrtc.SessionDescription {
-   broker := mustParseURL(brokerURL)
-   broker.Path = "/proxy"
+   broker := brokerURL.ResolveReference({Path: "proxy"})
for {
req, _ := http.NewRequest("POST", broker.String(), 
bytes.NewBuffer([]byte(sid)))
req.Header.Set("X-Session-ID", sid)
@@ -156,8 +146,7 @@ func pollOffer(sid string) *webrtc.SessionDescription {
 }
 
 func sendAnswer(sid string, pc *webrtc.PeerConnection) error {
-   broker := mustParseURL(brokerURL)
-   broker.Path = "/answer"
+   broker := brokerURL.ResolveReference({Path: "answer"})
body := bytes.NewBuffer([]byte(pc.LocalDescription().Serialize()))
req, _ := http.NewRequest("POST", broker.String(), body)
req.Header.Set("X-Session-ID", sid)
@@ -349,9 +338,10 @@ func main() {
var capacity uint
var stunURL string
var logFilename string
+   var rawBrokerURL string
 
flag.UintVar(, "capacity", 10, "maximum concurrent clients")
-   flag.StringVar(, "broker", defaultBrokerURL, "broker URL")
+   flag.StringVar(, "broker", defaultBrokerURL, "broker URL")
flag.StringVar(, "relay", defaultRelayURL, "websocket relay 
URL")
flag.StringVar(, "stun", defaultSTUNURL, "stun URL")
flag.StringVar(, "log", "", "log filename")
@@ -370,7 +360,7 @@ func main() {
log.Println("starting")
 
var err error
-   _, err = url.Parse(brokerURL)
+   brokerURL, err = url.Parse(rawBrokerURL)
if err != nil {
log.Fatalf("invalid broker url: %s", err)
}

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

[tor-commits] [snowflake/master] Add a "starting" log line to proxy-go.

[dcf]

commit 44ab82bc612dac3f9605afd44f057ef199b2cc12
Author: David Fifield 
Date:   Tue Mar 13 19:25:41 2018 -0700

Add a "starting" log line to proxy-go.
---
 proxy-go/snowflake.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go
index ca59adf..debe23c 100644
--- a/proxy-go/snowflake.go
+++ b/proxy-go/snowflake.go
@@ -367,6 +367,8 @@ func main() {
log.SetOutput(io.MultiWriter(os.Stderr, f))
}
 
+   log.Println("starting")
+
var err error
_, err = url.Parse(brokerURL)
if err != nil {

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

[tor-commits] [snowflake/master] Wait briefly after calling ListenAndServe{TLS} to see if it errors.

[dcf]

commit ea7b9c02231cc03f1f0a879528310a93681b80ff
Author: David Fifield 
Date:   Mon Mar 12 14:21:11 2018 -0700

Wait briefly after calling ListenAndServe{TLS} to see if it errors.

This is a port of commit e3f3054f8b74caa639a6d9be09702693af9a70e7 from
meek.

In the previous commit, we changed from separate Listen and Serve steps
to always calling ListenAndServe. However, we would really like to
immediately get feedback if any errors happen in the Listen step inside
the call, because it's much better for debugging if those errors get
reported to tor through SMETHOD-ERROR--rather than reporting success to
tor and actually logging an error only in the snowflake log. So we wait
100 ms for an error to occur before deciding that the Listen succeeded.

We don't need to apply this hack to the ACME HTTP-01 listener, because
it's a plaintext listener. Unlike in the TLS case, there isn't any
internal magic that the net library does that we have to rely on. We
just call net.ListenTCP and check for an error.
---
 server/server.go | 30 +-
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/server/server.go b/server/server.go
index 8fd703a..0136fc0 100644
--- a/server/server.go
+++ b/server/server.go
@@ -30,6 +30,10 @@ const requestTimeout = 10 * time.Second
 
 const maxMessageSize = 64 * 1024
 
+// How long to wait for ListenAndServe or ListenAndServeTLS to return an error
+// before deciding that it's not going to return.
+const listenAndServeErrorTimeout = 100 * time.Millisecond
+
 var ptInfo pt.ServerInfo
 
 // When a connection handler starts, +1 is written to this channel; when it
@@ -174,7 +178,7 @@ func webSocketHandler(ws *websocket.WebSocket) {
 
 func initServer(addr *net.TCPAddr,
getCertificate func(*tls.ClientHelloInfo) (*tls.Certificate, error),
-   listenAndServe func(*http.Server)) (*http.Server, error) {
+   listenAndServe func(*http.Server, chan<- error)) (*http.Server, error) {
// We're not capable of listening on port 0 (i.e., an ephemeral port
// unknown in advance). The reason is that while the net/http package
// exposes ListenAndServe and ListenAndServeTLS, those functions never
@@ -206,28 +210,44 @@ func initServer(addr *net.TCPAddr,
}
server.TLSConfig.GetCertificate = getCertificate
 
-   go listenAndServe(server)
+   // Another unfortunate effect of the inseparable net/http ListenAndServe
+   // is that we can't check for Listen errors like "permission denied" and
+   // "address already in use" without potentially entering the infinite
+   // loop of Serve. The hack we apply here is to wait a short time,
+   // listenAndServeErrorTimeout, to see if an error is returned (because
+   // it's better if the error message goes to the tor log through
+   // SMETHOD-ERROR than if it only goes to the snowflake log).
+   errChan := make(chan error)
+   go listenAndServe(server, errChan)
+   select {
+   case err = <-errChan:
+   break
+   case <-time.After(listenAndServeErrorTimeout):
+   break
+   }
 
-   return server, nil
+   return server, err
 }
 
 func startServer(addr *net.TCPAddr) (*http.Server, error) {
-   return initServer(addr, nil, func(server *http.Server) {
+   return initServer(addr, nil, func(server *http.Server, errChan chan<- 
error) {
log.Printf("listening with plain HTTP on %s", addr)
err := server.ListenAndServe()
if err != nil {
log.Printf("error in ListenAndServe: %s", err)
}
+   errChan <- err
})
 }
 
 func startServerTLS(addr *net.TCPAddr, getCertificate 
func(*tls.ClientHelloInfo) (*tls.Certificate, error)) (*http.Server, error) {
-   return initServer(addr, getCertificate, func(server *http.Server) {
+   return initServer(addr, getCertificate, func(server *http.Server, 
errChan chan<- error) {
log.Printf("listening with HTTPS on %s", addr)
err := server.ListenAndServeTLS("", "")
if err != nil {
log.Printf("error in ListenAndServeTLS: %s", err)
}
+   errChan <- err
})
 }
 

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

[tor-commits] [snowflake/master] Use ListenAndServe{TLS} rather than separate Listen and Serve.

[dcf]

commit 19b317e7814cc0cfaab8b20bc61c3663005c02dc
Author: David Fifield 
Date:   Mon Mar 12 13:34:57 2018 -0700

Use ListenAndServe{TLS} rather than separate Listen and Serve.

This is a port of commit cea86c937dc278ba6b2100c238b1d5206bbae2f0 from
meek. Its purpose is to remove the need to copy-paste parts of
net/http.Server.ListenAndServeTLS. Here is a copy of the commit message
from meek:

The net/http package provides ListenAndServe and ListenAndServeTLS
functions, but it doesn't provide a way to set up a listener without
also entering an infinite serve loop. This matters for
ListenAndServeTLS, which sets up a lot of magic behind the scenes for
TLS and HTTP/2 support. Formerly, we had copy-pasted code from
ListenAndServeTLS, but that code has only gotten more complicated in
upstream net/http.

The price we pay for this is that it's no longer possible for a server
bindaddr to ask to listen on port 0 (i.e., a random ephemeral port).
That's because we never get a change to find out what the listening
address is, before entering the serve loop.

What we gain is HTTP/2 support; formerly our copy-pasted code had the
side effect of disabling HTTP/2, because it was copied from an older
version and did things like
config.NextProtos = []string{"http/1.1"}

The new code calls http2.ConfigureServer first, but that's not what's
providing HTTP/2 support. HTTP/2 support happens by default. The reason
we call http2.ConfigureServer is because we need to set
TLSConfig.GetCertificate, and http2.ConfigureServer is a convenient way
to initialize TLSConfig in a way that is guaranteed to work with HTTP/2.
---
 server/server.go | 116 ---
 1 file changed, 60 insertions(+), 56 deletions(-)

diff --git a/server/server.go b/server/server.go
index 5ec3ff9..8fd703a 100644
--- a/server/server.go
+++ b/server/server.go
@@ -22,6 +22,7 @@ import (
"git.torproject.org/pluggable-transports/goptlib.git"
"git.torproject.org/pluggable-transports/websocket.git/websocket"
"golang.org/x/crypto/acme/autocert"
+   "golang.org/x/net/http2"
 )
 
 const ptMethodName = "snowflake"
@@ -171,64 +172,63 @@ func webSocketHandler(ws *websocket.WebSocket) {
proxy(or, )
 }
 
-func listenTLS(network string, addr *net.TCPAddr, m *autocert.Manager) 
(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
-   // infinite loop).
+func initServer(addr *net.TCPAddr,
+   getCertificate func(*tls.ClientHelloInfo) (*tls.Certificate, error),
+   listenAndServe func(*http.Server)) (*http.Server, error) {
+   // We're not capable of listening on port 0 (i.e., an ephemeral port
+   // unknown in advance). The reason is that while the net/http package
+   // exposes ListenAndServe and ListenAndServeTLS, those functions never
+   // return, so there's no opportunity to find out what the port number
+   // is, in between the Listen and Serve steps.
// https://groups.google.com/d/msg/Golang-nuts/3F1VRCCENp8/3hcayZiwYM8J
-   config := {}
-   config.NextProtos = []string{"http/1.1"}
-   config.GetCertificate = m.GetCertificate
+   if addr.Port == 0 {
+   return nil, fmt.Errorf("cannot listen on port %d; configure a 
port using ServerTransportListenAddr", addr.Port)
+   }
 
-   conn, err := net.ListenTCP(network, addr)
+   var config websocket.Config
+   config.MaxMessageSize = maxMessageSize
+   server := {
+   Addr:addr.String(),
+   Handler: config.Handler(webSocketHandler),
+   ReadTimeout: requestTimeout,
+   }
+   // We need to override server.TLSConfig.GetCertificate--but first
+   // server.TLSConfig needs to be non-nil. If we just create our own new
+   // , it will lack the default settings that the net/http
+   // package sets up for things like HTTP/2. Therefore we first call
+   // http2.ConfigureServer for its side effect of initializing
+   // server.TLSConfig properly. An alternative would be to make a dummy
+   // net.Listener, call Serve on it, and let it return.
+   // https://github.com/golang/go/issues/16588#issuecomment-237386446
+   err := http2.ConfigureServer(server, nil)
if err != nil {
-   return nil, err
+   return server, err
}
+   server.TLSConfig.GetCertificate = getCertificate
 
-   // Additionally disable SSLv3 because of the POODLE attack.
-   // 

[tor-commits] [tor/master] DisableNetwork documentation improvised

[nickm]

commit 42008ee72180752dc442ccd69b568e786f9a9bb8
Author: ArunaMaurya221B 
Date:   Mon Feb 12 15:09:00 2018 +0530

DisableNetwork documentation improvised
---
 doc/tor.1.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index bc04ed6ed..3ebddf9b3 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -311,7 +311,9 @@ GENERAL OPTIONS
 other than controller connections, and we close (and don't reattempt)
 any outbound
 connections.  Controllers sometimes use this option to avoid using
-the network until Tor is fully configured. (Default: 0)
+the network until Tor is fully configured.  Tor will make still certain
+network-related calls (like DNS lookups) as a part of its configuration
+process, even if DisableNetwork is set. (Default: 0)
 
 [[ConstrainedSockets]] **ConstrainedSockets** **0**|**1**::
 If set, Tor will tell the kernel to attempt to shrink the buffers for all

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

[tor-commits] [tor/master] Revised patch with 78 characters per line

[nickm]

commit a9203c65f11986dbed98c8f6b8d6ae9390db455f
Author: ArunaMaurya221B 
Date:   Wed Mar 7 19:13:22 2018 +0530

Revised patch with 78 characters per line
---
 doc/tor.1.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 7259149d9..bc04ed6ed 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2257,7 +2257,8 @@ is non-zero):
 When this option is enabled, Tor collects statistics for padding cells
 sent and received by this relay, in addition to total cell counts.
 These statistics are rounded, and omitted if traffic is low. This
-information is important for load balancing decisions related to padding. 
If ExtraInfoStatistics is enabled, it will be published
+information is important for load balancing decisions related to padding.
+If ExtraInfoStatistics is enabled, it will be published
 as a part of extra-info document. (Default: 1)
 
 [[DirReqStatistics]] **DirReqStatistics** **0**|**1**::

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

[tor-commits] [tor/master] PaddingStatistics documented properly

[nickm]

commit c29e66a88345ec90d8a8cffbad94beabd0b364ad
Author: ArunaMaurya221B 
Date:   Sat Feb 10 19:40:05 2018 +0530

PaddingStatistics documented properly
---
 doc/tor.1.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 24b075785..7259149d9 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2257,8 +2257,8 @@ is non-zero):
 When this option is enabled, Tor collects statistics for padding cells
 sent and received by this relay, in addition to total cell counts.
 These statistics are rounded, and omitted if traffic is low. This
-information is important for load balancing decisions related to padding.
-(Default: 1)
+information is important for load balancing decisions related to padding. 
If ExtraInfoStatistics is enabled, it will be published
+as a part of extra-info document. (Default: 1)
 
 [[DirReqStatistics]] **DirReqStatistics** **0**|**1**::
 Relays and bridges only.



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

[tor-commits] [tor/master] Update the primitive types explanation in the Rust coding standards

[nickm]

commit 01a977b492327f39e7490e9ffbc5a27f15734dc9
Author: teor 
Date:   Tue Feb 27 15:55:13 2018 +1100

Update the primitive types explanation in the Rust coding standards

Part of #25368.
Includes c_double in anticipation of #23061.
---
 doc/HACKING/CodingStandardsRust.md | 22 ++
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/doc/HACKING/CodingStandardsRust.md 
b/doc/HACKING/CodingStandardsRust.md
index d0b17c160..731a7bb85 100644
--- a/doc/HACKING/CodingStandardsRust.md
+++ b/doc/HACKING/CodingStandardsRust.md
@@ -284,12 +284,26 @@ Here are some additional bits of advice and rules:
 }
 }
 
-3. Pass only integer types and bytes over the boundary
+3. Pass only C-compatible primitive types and bytes over the boundary
 
-   The only non-integer type which may cross the FFI boundary is
+   Rust's C-compatible primitive types are integers and floats.
+   These types are declared in the [libc 
crate](https://doc.rust-lang.org/libc/x86_64-unknown-linux-gnu/libc/index.html#types).
+   Most Rust objects have different 
[representations](https://doc.rust-lang.org/libc/x86_64-unknown-linux-gnu/libc/index.html#types)
+   in C and Rust, so they can't be passed using FFI.
+
+   Tor currently uses the following Rust primitive types from libc for FFI:
+   * defined-size integers: `uint32_t`
+   * native-sized integers: `c_int`
+   * native-sized floats: `c_double`
+   * native-sized raw pointers: `* c_void`, `* c_char`, `** c_char`
+
+   TODO: C smartlist to Stringlist conversion using FFI
+
+   The only non-primitive type which may cross the FFI boundary is
bytes, e.g. `&[u8]`.  This SHOULD be done on the Rust side by
-   passing a pointer (`*mut libc::c_char`) and a length
-   (`libc::size_t`).
+   passing a pointer (`*mut libc::c_char`). The length can be passed
+   explicitly (`libc::size_t`), or the string can be NUL-byte terminated
+   C string.
 
One might be tempted to do this via doing
`CString::new("blah").unwrap().into_raw()`. This has several problems:



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

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/rust-std'

[nickm]

commit bebd5809f381d9ead529efeb28d62dac01f846a8
Merge: 03f748d0c 01a977b49
Author: Nick Mathewson 
Date:   Tue Mar 13 16:15:00 2018 -0400

Merge remote-tracking branch 'teor/rust-std'

 doc/HACKING/CodingStandardsRust.md | 22 ++
 1 file changed, 18 insertions(+), 4 deletions(-)

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

[tor-commits] [snowflake/master] Use ResolveReference to construct the /client URL.

[arlo]

commit c61336c897b5d21cc94a21241e98b33df5dcbf78
Author: David Fifield 
Date:   Mon Mar 12 20:28:01 2018 -0700

Use ResolveReference to construct the /client URL.

This way works when the base URL lacks a path, e.g.
"http://127.0.0.1:8080;.
https://bugs.torproject.org/25472
---
 client/rendezvous.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/rendezvous.go b/client/rendezvous.go
index 0aed3f7..cab7f5a 100644
--- a/client/rendezvous.go
+++ b/client/rendezvous.go
@@ -80,7 +80,8 @@ func (bc *BrokerChannel) Negotiate(offer 
*webrtc.SessionDescription) (
bc.Host, "\nFront URL:  ", bc.url.Host)
data := bytes.NewReader([]byte(offer.Serialize()))
// Suffix with broker's client registration handler.
-   request, err := http.NewRequest("POST", bc.url.String()+"client", data)
+   clientURL := bc.url.ResolveReference({Path: "client"})
+   request, err := http.NewRequest("POST", clientURL.String(), data)
if nil != err {
return nil, err
}

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

[tor-commits] [snowflake/master] Provide a flag to Log to state dir

[arlo]

commit 8a31312ca11f75eeb070ba30e25ba2096418e941
Author: Arlo Breault 
Date:   Thu Mar 8 16:05:33 2018 -0500

Provide a flag to Log to state dir
---
 client/snowflake.go | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/client/snowflake.go b/client/snowflake.go
index b958a7f..3b8a248 100644
--- a/client/snowflake.go
+++ b/client/snowflake.go
@@ -10,6 +10,7 @@ import (
"net"
"os"
"os/signal"
+   "path/filepath"
"strings"
"sync"
"syscall"
@@ -126,13 +127,22 @@ func main() {
brokerURL := flag.String("url", "", "URL of signaling broker")
frontDomain := flag.String("front", "", "front domain")
logFilename := flag.String("log", "", "name of log file")
+   logToStateDir := flag.Bool("logToStateDir", false, "resolve the log 
file relative to tor's pt state dir")
max := flag.Int("max", DefaultSnowflakeCapacity,
"capacity for number of multiplexed WebRTC peers")
flag.Parse()
 
webrtc.SetLoggingVerbosity(1)
log.SetFlags(log.LstdFlags | log.LUTC)
+
if *logFilename != "" {
+   if *logToStateDir {
+   stateDir, err := pt.MakeStateDir()
+   if err != nil {
+   log.Fatal(err)
+   }
+   *logFilename = filepath.Join(stateDir, *logFilename)
+   }
logFile, err := os.OpenFile(*logFilename,
os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)
if err != nil {

___
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 3ddb546fbe7568afc6da14dfb7b66cb9075b7080
Author: Translation commit bot 
Date:   Tue Mar 13 18:46:47 2018 +

Update translations for tails-misc_completed
---
 es.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/es.po b/es.po
index 1529337a2..ff1e898e4 100644
--- a/es.po
+++ b/es.po
@@ -16,8 +16,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-03-13 09:11+\n"
-"Last-Translator: strel\n"
+"PO-Revision-Date: 2018-03-13 18:29+\n"
+"Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -204,7 +204,7 @@ msgstr "Falló el MAC spoofing para la tarjeta de red 
${nic_name} (${nic}). La r
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109
 msgid "Lock Screen"
-msgstr "Pantalla de bloqueo"
+msgstr "Bloquear pantalla"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
@@ -217,7 +217,7 @@ msgstr "Bloqueo de pantalla"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
 msgid "Set up a password to unlock the screen."
-msgstr "Establezca una contraseña para desbloquear la pantalla."
+msgstr "Establece una contraseña para desbloquear la pantalla"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
 msgid "Password"

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

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

[translation]

commit a26542814689029df71044b13cda6365579bf88e
Author: Translation commit bot 
Date:   Tue Mar 13 18:46:42 2018 +

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

diff --git a/es.po b/es.po
index 1529337a2..ff1e898e4 100644
--- a/es.po
+++ b/es.po
@@ -16,8 +16,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-03-13 09:11+\n"
-"Last-Translator: strel\n"
+"PO-Revision-Date: 2018-03-13 18:29+\n"
+"Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -204,7 +204,7 @@ msgstr "Falló el MAC spoofing para la tarjeta de red 
${nic_name} (${nic}). La r
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109
 msgid "Lock Screen"
-msgstr "Pantalla de bloqueo"
+msgstr "Bloquear pantalla"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
@@ -217,7 +217,7 @@ msgstr "Bloqueo de pantalla"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
 msgid "Set up a password to unlock the screen."
-msgstr "Establezca una contraseña para desbloquear la pantalla."
+msgstr "Establece una contraseña para desbloquear la pantalla"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
 msgid "Password"

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

[tor-commits] [onionoo/master] Add missing change log entry for #25241.

[karsten]

commit f6ff7bfeb7121c54a85e18cbe0f886dbb53cec19
Author: Karsten Loesing 
Date:   Tue Mar 13 17:43:16 2018 +0100

Add missing change log entry for #25241.
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa33c82..c95dacf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
  * Medium changes
- Stop omitting "n" in summary docs for "Unnamed" relays/bridges.
+   - Always add a relay to its own "effective_family".
 
  * Minor changes
- Make responses deterministic by always sorting results by

___
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.5.1

[boklm]

commit 545bbe03bffe8094ed4de68becd42dbf07e7d32f
Author: Nicolas Vigier 
Date:   Tue Mar 13 16:25:00 2018 +0100

Add new Tor Browser version: 7.5.1
---
 include/versions.wmi   | 6 +++---
 projects/torbrowser/RecommendedTBBVersions | 4 
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index cf50a5a9..d8ef0edd 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -4,9 +4,9 @@
 maint-7.5
 
 # *** tor browser stable ***
-7.5
-2018-01-23
-0.3.2.9
+7.5.1
+2018-03-13
+0.3.2.10
 
 # If all platforms are on the same version, you only to update
 # version-torbrowserbundle-all and releasedate-torbrowserbundle-all
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index ee821ff1..413e64f3 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -3,6 +3,10 @@
 "7.5-MacOS",
 "7.5-Linux",
 "7.5-Windows",
+"7.5.1",
+"7.5.1-MacOS",
+"7.5.1-Linux",
+"7.5.1-Windows",
 "8.0a1",
 "8.0a1-MacOS",
 "8.0a1-Linux",



___
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: 8.0a3

[boklm]

commit e204f1626bac7d820f35af4e2579af9dc5b934ad
Author: Nicolas Vigier 
Date:   Tue Mar 13 16:26:35 2018 +0100

Add new Tor Browser version: 8.0a3
---
 include/versions.wmi   | 4 ++--
 projects/torbrowser/RecommendedTBBVersions | 6 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index d8ef0edd..fe86cd4d 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -22,8 +22,8 @@
 ../dist/torbrowser//tor-win32-.zip
 
 # *** tor browser beta/alpha ***
-8.0a2
-2018-02-23
+8.0a3
+2018-03-13
 0.0.16
 
 # If all platforms are on the same version, you only need to update
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 413e64f3..c0248336 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -14,5 +14,9 @@
 "8.0a2",
 "8.0a2-MacOS",
 "8.0a2-Linux",
-"8.0a2-Windows"
+"8.0a2-Windows",
+"8.0a3",
+"8.0a3-MacOS",
+"8.0a3-Linux",
+"8.0a3-Windows"
 ]

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

[tor-commits] [onionoo/master] Return results in deterministic order.

[karsten]

commit 8dfabbe36d5f90e2df14b504461298b1585fd5ae
Author: iwakeh 
Date:   Wed Dec 20 16:16:03 2017 +

Return results in deterministic order.

Part of task-25002.
---
 CHANGELOG.md   |  5 +
 .../java/org/torproject/onionoo/server/RequestHandler.java | 10 --
 .../torproject/onionoo/server/SummaryDocumentComparator.java   |  6 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0fed40..fa33c82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
  * Medium changes
- Stop omitting "n" in summary docs for "Unnamed" relays/bridges.
 
+ * Minor changes
+   - Make responses deterministic by always sorting results by
+ fingerprint, either if no specific order was requested or to
+ break ties after ordering results as requested.
+
 
 # Changes in version 5.0-1.10.1 - 2018-02-07
 
diff --git a/src/main/java/org/torproject/onionoo/server/RequestHandler.java 
b/src/main/java/org/torproject/onionoo/server/RequestHandler.java
index 55938c5..63b8fe9 100644
--- a/src/main/java/org/torproject/onionoo/server/RequestHandler.java
+++ b/src/main/java/org/torproject/onionoo/server/RequestHandler.java
@@ -603,12 +603,10 @@ public class RequestHandler {
 uniqueBridges.add(bridge);
   }
 }
-if (this.order != null) {
-  Comparator comparator
-  = new SummaryDocumentComparator(this.order);
-  Collections.sort(uniqueRelays, comparator);
-  Collections.sort(uniqueBridges, comparator);
-}
+Comparator comparator
+= new SummaryDocumentComparator(this.order);
+Collections.sort(uniqueRelays, comparator);
+Collections.sort(uniqueBridges, comparator);
 this.orderedRelays.addAll(uniqueRelays);
 this.orderedBridges.addAll(uniqueBridges);
   }
diff --git 
a/src/main/java/org/torproject/onionoo/server/SummaryDocumentComparator.java 
b/src/main/java/org/torproject/onionoo/server/SummaryDocumentComparator.java
index 0e6729b..86d4d32 100644
--- a/src/main/java/org/torproject/onionoo/server/SummaryDocumentComparator.java
+++ b/src/main/java/org/torproject/onionoo/server/SummaryDocumentComparator.java
@@ -13,7 +13,8 @@ public class SummaryDocumentComparator implements 
Comparator {
 
   /** Comparator is initialized with the order parameters. */
   public SummaryDocumentComparator(String ... orderParameters) {
-this.orderParameters = orderParameters;
+this.orderParameters
+= null == orderParameters ? new String[]{} : orderParameters;
   }
 
   @Override
@@ -45,6 +46,9 @@ public class SummaryDocumentComparator implements 
Comparator {
 break;
   }
 }
+if (0 == result) {
+  result = o1.getFingerprint().compareTo(o2.getFingerprint());
+}
 return result;
   }
 }

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

[tor-commits] [onionoo/master] Always add own fingerprint to effective family.

[karsten]

commit a9a0f7054cf66ee51b245b02369119832e330585
Author: Karsten Loesing 
Date:   Wed Feb 14 22:40:52 2018 +0100

Always add own fingerprint to effective family.

Some relays include their own fingerprint in the family line of their
server descriptor and others don't.  To provide consistent data Onionoo
now adds a relay's own fingerprint to its effective family.

Implements task-25241.
---
 .../org/torproject/onionoo/docs/NodeStatus.java| 31 +++---
 .../torproject/onionoo/docs/NodeStatusTest.java| 19 ++---
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java 
b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
index cfd13aa..94da8c8 100644
--- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
@@ -19,6 +19,7 @@ import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 public class NodeStatus extends Document {
 
@@ -54,33 +55,31 @@ public class NodeStatus extends Document {
 
   private String[] declaredFamily;
 
+  @SuppressWarnings("checkstyle:javadocmethod")
   public void setDeclaredFamily(SortedSet declaredFamily) {
-this.declaredFamily = collectionToStringArray(declaredFamily);
+SortedSet declaredFamilyIncludingSelf
+= new TreeSet<>(declaredFamily);
+declaredFamilyIncludingSelf.add(this.fingerprint);
+this.declaredFamily = collectionToStringArray(declaredFamilyIncludingSelf);
   }
 
+  @SuppressWarnings("checkstyle:javadocmethod")
   public SortedSet getDeclaredFamily() {
-return stringArrayToSortedSet(this.declaredFamily);
+SortedSet declaredFamilyIncludingSelf =
+stringArrayToSortedSet(this.declaredFamily);
+declaredFamilyIncludingSelf.add(this.fingerprint);
+return declaredFamilyIncludingSelf;
   }
 
   private static String[] collectionToStringArray(
   Collection collection) {
-String[] stringArray = null;
-if (collection != null && !collection.isEmpty()) {
-  stringArray = new String[collection.size()];
-  int index = 0;
-  for (String string : collection) {
-stringArray[index++] = string;
-  }
-}
-return stringArray;
+return (null == collection || collection.isEmpty()) ? null
+: collection.toArray(new String[collection.size()]);
   }
 
   private SortedSet stringArrayToSortedSet(String[] stringArray) {
-SortedSet sortedSet = new TreeSet<>();
-if (stringArray != null) {
-  sortedSet.addAll(Arrays.asList(stringArray));
-}
-return sortedSet;
+return stringArray == null ? new TreeSet<>() : Arrays.stream(stringArray)
+.collect(Collectors.toCollection(TreeSet::new));
   }
 
   /* From network status entries: */
diff --git a/src/test/java/org/torproject/onionoo/docs/NodeStatusTest.java 
b/src/test/java/org/torproject/onionoo/docs/NodeStatusTest.java
index e2c5dac..2b90ece 100644
--- a/src/test/java/org/torproject/onionoo/docs/NodeStatusTest.java
+++ b/src/test/java/org/torproject/onionoo/docs/NodeStatusTest.java
@@ -53,36 +53,37 @@ public class NodeStatusTest {
   private static final String D = "";
   private static final String E = "";
   private static final String F = "";
+  private static final String G = "F2044413DAC2E02E3D6BCF4735A19BCA1DE97281";
   private static final String NICK = "nickname";
 
   @Test
   public void testFamiliesEmpty() {
 assertFamiliesCanBeDeSerialized(
-new String[] {}, new String[] {}, new String[] {});
+new String[] { G }, new String[] {}, new String[] {});
   }
 
   @Test
   public void testFamiliesOneNotMutual() {
 assertFamiliesCanBeDeSerialized(
-new String[] { A }, new String[] {}, new String[] {});
+new String[] { A, G }, new String[] {}, new String[] {});
   }
 
   @Test
   public void testFamiliesTwoNotMutual() {
 assertFamiliesCanBeDeSerialized(
-new String[] { A, B }, new String[] {}, new String[] {});
+new String[] { A, B, G }, new String[] {}, new String[] {});
   }
 
   @Test
   public void testFamiliesOneNotMutualOneMutual() {
 assertFamiliesCanBeDeSerialized(
-new String[] { A, B }, new String[] { B }, new String[] { B });
+new String[] { A, B, G }, new String[] { B }, new String[] { B });
   }
 
   @Test
   public void testFamiliesOneMutualOneIndirect() {
 assertFamiliesCanBeDeSerialized(
-new String[] { A }, new String[] { A }, new String[] { A, B });
+new String[] { A, G }, new String[] { A }, new String[] { A, B });
   }
 
   @Test
@@ -92,26 +93,26 @@ public class NodeStatusTest {
  * with this relay.  It's a valid case, because B can be in a mutual
  * family 

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm]

commit 5ee93047cbf711398ba7425b86d961e688cfaa53
Merge: 504dc5a93 f0f2fab5e
Author: Nick Mathewson 
Date:   Tue Mar 13 11:03:08 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/ticket23635 |  3 +++
 doc/tor.1.txt   | 19 ++-
 2 files changed, 13 insertions(+), 9 deletions(-)

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

[tor-commits] [tor/maint-0.3.3] Tweaks into AccountingStart documentation.

[nickm]

commit c1cfa0fbc4864ae5c54cb89c84a184523ea1aa9e
Author: Fernando Fernandez Mancera 
Date:   Thu Mar 8 12:28:34 2018 +0100

Tweaks into AccountingStart documentation.

Signed-off-by: Fernando Fernandez Mancera 
---
 doc/tor.1.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 54375300a..41dab4ae3 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2173,7 +2173,7 @@ is non-zero):
 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 relay will go at full 
speed,
-use all the quota you specify, then hibernate for the rest of the 
month.(The
+use all the quota you specify, then hibernate for the rest of the period. 
(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**



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

[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3

[nickm]

commit f0f2fab5e16cadf37938b48a47c062e539eef9c0
Merge: 6bc324c96 c1cfa0fbc
Author: Nick Mathewson 
Date:   Tue Mar 13 11:02:34 2018 -0400

Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3

 changes/ticket23635 |  3 +++
 doc/tor.1.txt   | 19 ++-
 2 files changed, 13 insertions(+), 9 deletions(-)




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

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm]

commit 03f748d0ca00fa27279b3060eb19b5db23e18f6b
Merge: c6d364e8a f0f2fab5e
Author: Nick Mathewson 
Date:   Tue Mar 13 11:03:08 2018 -0400

Merge branch 'maint-0.3.3'

 changes/ticket23635 |  3 +++
 doc/tor.1.txt   | 19 ++-
 2 files changed, 13 insertions(+), 9 deletions(-)

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

[tor-commits] [tor/master] Improve the documentation of AccountingStart parameter.

[nickm]

commit eb089ecaa023eaacd06f042e67bf4b4adda1c8ee
Author: Fernando Fernandez Mancera 
Date:   Mon Feb 12 17:10:04 2018 +0100

Improve the documentation of AccountingStart parameter.

Fixes #23635.

Signed-off-by: Fernando Fernandez Mancera 
---
 changes/ticket23635 |  3 +++
 doc/tor.1.txt   | 19 ++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/changes/ticket23635 b/changes/ticket23635
new file mode 100644
index 0..54d303e4b
--- /dev/null
+++ b/changes/ticket23635
@@ -0,0 +1,3 @@
+  o Documentation:
+- Improved the documentation of AccountingStart paremeter.
+  Closes ticket 23635.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 5ad818365..54375300a 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2170,15 +2170,16 @@ is non-zero):
 (Default: max)
 
 [[AccountingStart]] **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. (Default:
-"month 1 0:00")
+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 relay will go at full 
speed,
+use all the quota you specify, then hibernate for the rest of the 
month.(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.
+(Default: "month 1 0:00")
 
 [[RefuseUnknownExits]] **RefuseUnknownExits** **0**|**1**|**auto**::
 Prevent nodes that don't appear in the consensus from exiting using this



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

[tor-commits] [tor/master] Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3

[nickm]

commit f0f2fab5e16cadf37938b48a47c062e539eef9c0
Merge: 6bc324c96 c1cfa0fbc
Author: Nick Mathewson 
Date:   Tue Mar 13 11:02:34 2018 -0400

Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3

 changes/ticket23635 |  3 +++
 doc/tor.1.txt   | 19 ++-
 2 files changed, 13 insertions(+), 9 deletions(-)




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

[tor-commits] [tor/release-0.3.3] Tweaks into AccountingStart documentation.

[nickm]

commit c1cfa0fbc4864ae5c54cb89c84a184523ea1aa9e
Author: Fernando Fernandez Mancera 
Date:   Thu Mar 8 12:28:34 2018 +0100

Tweaks into AccountingStart documentation.

Signed-off-by: Fernando Fernandez Mancera 
---
 doc/tor.1.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 54375300a..41dab4ae3 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2173,7 +2173,7 @@ is non-zero):
 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 relay will go at full 
speed,
-use all the quota you specify, then hibernate for the rest of the 
month.(The
+use all the quota you specify, then hibernate for the rest of the period. 
(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**



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

[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3

[nickm]

commit f0f2fab5e16cadf37938b48a47c062e539eef9c0
Merge: 6bc324c96 c1cfa0fbc
Author: Nick Mathewson 
Date:   Tue Mar 13 11:02:34 2018 -0400

Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3

 changes/ticket23635 |  3 +++
 doc/tor.1.txt   | 19 ++-
 2 files changed, 13 insertions(+), 9 deletions(-)

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

[tor-commits] [tor/release-0.3.3] Improve the documentation of AccountingStart parameter.

[nickm]

commit eb089ecaa023eaacd06f042e67bf4b4adda1c8ee
Author: Fernando Fernandez Mancera 
Date:   Mon Feb 12 17:10:04 2018 +0100

Improve the documentation of AccountingStart parameter.

Fixes #23635.

Signed-off-by: Fernando Fernandez Mancera 
---
 changes/ticket23635 |  3 +++
 doc/tor.1.txt   | 19 ++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/changes/ticket23635 b/changes/ticket23635
new file mode 100644
index 0..54d303e4b
--- /dev/null
+++ b/changes/ticket23635
@@ -0,0 +1,3 @@
+  o Documentation:
+- Improved the documentation of AccountingStart paremeter.
+  Closes ticket 23635.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 5ad818365..54375300a 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2170,15 +2170,16 @@ is non-zero):
 (Default: max)
 
 [[AccountingStart]] **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. (Default:
-"month 1 0:00")
+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 relay will go at full 
speed,
+use all the quota you specify, then hibernate for the rest of the 
month.(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.
+(Default: "month 1 0:00")
 
 [[RefuseUnknownExits]] **RefuseUnknownExits** **0**|**1**|**auto**::
 Prevent nodes that don't appear in the consensus from exiting using this



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

[tor-commits] [tor/master] Tweaks into AccountingStart documentation.

[nickm]

commit c1cfa0fbc4864ae5c54cb89c84a184523ea1aa9e
Author: Fernando Fernandez Mancera 
Date:   Thu Mar 8 12:28:34 2018 +0100

Tweaks into AccountingStart documentation.

Signed-off-by: Fernando Fernandez Mancera 
---
 doc/tor.1.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 54375300a..41dab4ae3 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2173,7 +2173,7 @@ is non-zero):
 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 relay will go at full 
speed,
-use all the quota you specify, then hibernate for the rest of the 
month.(The
+use all the quota you specify, then hibernate for the rest of the period. 
(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**



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

[tor-commits] [tor/maint-0.3.3] Improve the documentation of AccountingStart parameter.

[nickm]

commit eb089ecaa023eaacd06f042e67bf4b4adda1c8ee
Author: Fernando Fernandez Mancera 
Date:   Mon Feb 12 17:10:04 2018 +0100

Improve the documentation of AccountingStart parameter.

Fixes #23635.

Signed-off-by: Fernando Fernandez Mancera 
---
 changes/ticket23635 |  3 +++
 doc/tor.1.txt   | 19 ++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/changes/ticket23635 b/changes/ticket23635
new file mode 100644
index 0..54d303e4b
--- /dev/null
+++ b/changes/ticket23635
@@ -0,0 +1,3 @@
+  o Documentation:
+- Improved the documentation of AccountingStart paremeter.
+  Closes ticket 23635.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 5ad818365..54375300a 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2170,15 +2170,16 @@ is non-zero):
 (Default: max)
 
 [[AccountingStart]] **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. (Default:
-"month 1 0:00")
+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 relay will go at full 
speed,
+use all the quota you specify, then hibernate for the rest of the 
month.(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.
+(Default: "month 1 0:00")
 
 [[RefuseUnknownExits]] **RefuseUnknownExits** **0**|**1**|**auto**::
 Prevent nodes that don't appear in the consensus from exiting using this



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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm]

commit 504dc5a93c33db5871305e3b501bb08c4210cb92
Merge: 09612b19c 6bc324c96
Author: Nick Mathewson 
Date:   Tue Mar 13 10:59:30 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 0e7f15fdb6a5523ab1d4c856b5db455df3b3e1aa
Merge: 0aa794d30 67a313f0e
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 6bc324c96abd463c4a386e81bd71b594ac59fed7
Merge: 950606dcc d60dc2755
Author: Nick Mathewson 
Date:   Tue Mar 13 10:59:30 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3




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

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 6bc324c96abd463c4a386e81bd71b594ac59fed7
Merge: 950606dcc d60dc2755
Author: Nick Mathewson 
Date:   Tue Mar 13 10:59:30 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3




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

[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit 67a313f0ecc281dd73004eaa810b17e3cdcc3a24
Merge: 9eb6f9d3c 3418a3a7f
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit d60dc27555a2bed448617e0b82e61817c9cff895
Merge: 094294dbb 0e7f15fdb
Author: Nick Mathewson 
Date:   Tue Mar 13 10:59:30 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm]

commit c6d364e8ae9a0265dd3e80756d7e8e9901cf3dd6
Merge: 1047ef140 6bc324c96
Author: Nick Mathewson 
Date:   Tue Mar 13 10:59:56 2018 -0400

Merge branch 'maint-0.3.3'

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)

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

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 0e7f15fdb6a5523ab1d4c856b5db455df3b3e1aa
Merge: 0aa794d30 67a313f0e
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm]

commit 2f397236b21a30899c7334b509200744a2a74987
Merge: 4b067f8b1 d60dc2755
Author: Nick Mathewson 
Date:   Tue Mar 13 10:59:30 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 950606dcc947fee4a7196bce0bab1595164fbab0
Merge: 676a28599 38b7885c9
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:03 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit 38b7885c90fd5e11495cb37f838fd55ca72e9290
Merge: 0026d1a67 0e7f15fdb
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:03 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit d60dc27555a2bed448617e0b82e61817c9cff895
Merge: 094294dbb 0e7f15fdb
Author: Nick Mathewson 
Date:   Tue Mar 13 10:59:30 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit d60dc27555a2bed448617e0b82e61817c9cff895
Merge: 094294dbb 0e7f15fdb
Author: Nick Mathewson 
Date:   Tue Mar 13 10:59:30 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit d60dc27555a2bed448617e0b82e61817c9cff895
Merge: 094294dbb 0e7f15fdb
Author: Nick Mathewson 
Date:   Tue Mar 13 10:59:30 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)

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

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 6bc324c96abd463c4a386e81bd71b594ac59fed7
Merge: 950606dcc d60dc2755
Author: Nick Mathewson 
Date:   Tue Mar 13 10:59:30 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

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

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit d60dc27555a2bed448617e0b82e61817c9cff895
Merge: 094294dbb 0e7f15fdb
Author: Nick Mathewson 
Date:   Tue Mar 13 10:59:30 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit 67a313f0ecc281dd73004eaa810b17e3cdcc3a24
Merge: 9eb6f9d3c 3418a3a7f
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 950606dcc947fee4a7196bce0bab1595164fbab0
Merge: 676a28599 38b7885c9
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:03 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm]

commit 09612b19c52ede4c8d2a89aaf18ab20e46014e66
Merge: 0456ec215 950606dcc
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:03 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)

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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit 38b7885c90fd5e11495cb37f838fd55ca72e9290
Merge: 0026d1a67 0e7f15fdb
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:03 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 0e7f15fdb6a5523ab1d4c856b5db455df3b3e1aa
Merge: 0aa794d30 67a313f0e
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit 67a313f0ecc281dd73004eaa810b17e3cdcc3a24
Merge: 9eb6f9d3c 3418a3a7f
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 0e7f15fdb6a5523ab1d4c856b5db455df3b3e1aa
Merge: 0aa794d30 67a313f0e
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit 38b7885c90fd5e11495cb37f838fd55ca72e9290
Merge: 0026d1a67 0e7f15fdb
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:03 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm]

commit 4b067f8b128f0c2c4b808d72793a394f628aac18
Merge: 4a03851e4 38b7885c9
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:03 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)

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

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit 67a313f0ecc281dd73004eaa810b17e3cdcc3a24
Merge: 9eb6f9d3c 3418a3a7f
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit 67a313f0ecc281dd73004eaa810b17e3cdcc3a24
Merge: 9eb6f9d3c 3418a3a7f
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm]

commit 164263fc5e739ff57d91986ee20a220edfbb8928
Merge: 4a27e6e23 67a313f0e
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)

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

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 35179a8c05810c0c0eafee82abad7450c165bd7e
Merge: 1eb7041ef 0e7f15fdb
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:03 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)

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

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 0e7f15fdb6a5523ab1d4c856b5db455df3b3e1aa
Merge: 0aa794d30 67a313f0e
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 0d63a60643f16974e857a16e5f6e36663d3caca3
Merge: b2c220a62 3418a3a7f
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)

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

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit 67a313f0ecc281dd73004eaa810b17e3cdcc3a24
Merge: 9eb6f9d3c 3418a3a7f
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit 67a313f0ecc281dd73004eaa810b17e3cdcc3a24
Merge: 9eb6f9d3c 3418a3a7f
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit 67a313f0ecc281dd73004eaa810b17e3cdcc3a24
Merge: 9eb6f9d3c 3418a3a7f
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 0e7f15fdb6a5523ab1d4c856b5db455df3b3e1aa
Merge: 0aa794d30 67a313f0e
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit 38b7885c90fd5e11495cb37f838fd55ca72e9290
Merge: 0026d1a67 0e7f15fdb
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:03 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 950606dcc947fee4a7196bce0bab1595164fbab0
Merge: 676a28599 38b7885c9
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:03 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)

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

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 0e7f15fdb6a5523ab1d4c856b5db455df3b3e1aa
Merge: 0aa794d30 67a313f0e
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)

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

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit 67a313f0ecc281dd73004eaa810b17e3cdcc3a24
Merge: 9eb6f9d3c 3418a3a7f
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)

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

[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2

[translation]

commit 0632b94d48d453313eec9712e3a4888943fb2158
Author: Translation commit bot 
Date:   Tue Mar 13 12:49:16 2018 +

Update translations for tails-greeter-2
---
 ca/ca.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ca/ca.po b/ca/ca.po
index 05bdd6e96..d49b84d85 100644
--- a/ca/ca.po
+++ b/ca/ca.po
@@ -69,7 +69,7 @@ msgstr "Camuflatge de Microsoft Windows 10"
 
 #: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
-msgstr "falsejament de direcció MAC"
+msgstr "Falsejament de direcció MAC"
 
 #: ../data/greeter.ui.h:14
 msgid ""

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

[tor-commits] [translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed

[translation]

commit 55e39fc4d59e411ef3e01af4ef2b431340070f48
Author: Translation commit bot 
Date:   Tue Mar 13 12:49:21 2018 +

Update translations for tails-greeter-2_completed
---
 ca/ca.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ca/ca.po b/ca/ca.po
index 05bdd6e96..d49b84d85 100644
--- a/ca/ca.po
+++ b/ca/ca.po
@@ -69,7 +69,7 @@ msgstr "Camuflatge de Microsoft Windows 10"
 
 #: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
-msgstr "falsejament de direcció MAC"
+msgstr "Falsejament de direcció MAC"
 
 #: ../data/greeter.ui.h:14
 msgid ""

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

[tor-commits] [tor/release-0.3.3] Add a missing prototype to our libevent configure stanza.

[nickm]

commit 53a807e1e94e01bf3ea7e90d1203b952eee929b0
Author: Nick Mathewson 
Date:   Tue Mar 13 13:37:26 2018 +0100

Add a missing prototype to our libevent configure stanza.

Fixes bug 25474; bugfix on 0.3.2.5-alpha.
---
 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/bug25474 b/changes/bug25474
new file mode 100644
index 0..7d3bd1c5f
--- /dev/null
+++ b/changes/bug25474
@@ -0,0 +1,5 @@
+  o Minor bugfixes (compilation):
+- Fix a c99 compliance issue in our configuration script that was
+  causing compilation issues when compiling Tor with certain
+  versions of xtools. Fixes bug 25474; bugfix on 0.3.2.5-alpha.
+
diff --git a/configure.ac b/configure.ac
index 5a74d6c61..b5cacd06a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -631,7 +631,8 @@ TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent 
$STATIC_LIBEVENT_FLAGS $T
 #include 
 #endif
 struct event_base;
-struct event_base *event_base_new(void);],
+struct event_base *event_base_new(void);
+void event_base_free(struct event_base *);],
 [
 #ifdef _WIN32
 {WSADATA d; WSAStartup(0x101,); }



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

[tor-commits] [tor/release-0.3.3] Merge branch 'bug25474_032' into maint-0.3.2

[nickm]

commit 094294dbb1e631d9b11ee8dbc3f70ccb9f290c54
Merge: 0026d1a67 53a807e1e
Author: Nick Mathewson 
Date:   Tue Mar 13 13:41:11 2018 +0100

Merge branch 'bug25474_032' into maint-0.3.2

 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm]

commit 0456ec21530f3364c0f41f1492e428ff330f24b0
Merge: ed73b086b 676a28599
Author: Nick Mathewson 
Date:   Tue Mar 13 13:44:09 2018 +0100

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/master] Add a missing prototype to our libevent configure stanza.

[nickm]

commit 53a807e1e94e01bf3ea7e90d1203b952eee929b0
Author: Nick Mathewson 
Date:   Tue Mar 13 13:37:26 2018 +0100

Add a missing prototype to our libevent configure stanza.

Fixes bug 25474; bugfix on 0.3.2.5-alpha.
---
 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/bug25474 b/changes/bug25474
new file mode 100644
index 0..7d3bd1c5f
--- /dev/null
+++ b/changes/bug25474
@@ -0,0 +1,5 @@
+  o Minor bugfixes (compilation):
+- Fix a c99 compliance issue in our configuration script that was
+  causing compilation issues when compiling Tor with certain
+  versions of xtools. Fixes bug 25474; bugfix on 0.3.2.5-alpha.
+
diff --git a/configure.ac b/configure.ac
index 5a74d6c61..b5cacd06a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -631,7 +631,8 @@ TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent 
$STATIC_LIBEVENT_FLAGS $T
 #include 
 #endif
 struct event_base;
-struct event_base *event_base_new(void);],
+struct event_base *event_base_new(void);
+void event_base_free(struct event_base *);],
 [
 #ifdef _WIN32
 {WSADATA d; WSAStartup(0x101,); }



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

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm]

commit 1047ef140e62a47d3d4019f6c30654ea9ef65954
Merge: 40154c1f9 676a28599
Author: Nick Mathewson 
Date:   Tue Mar 13 13:41:33 2018 +0100

Merge branch 'maint-0.3.3'

 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.3.3] Merge branch 'bug25474_032' into maint-0.3.2

[nickm]

commit 094294dbb1e631d9b11ee8dbc3f70ccb9f290c54
Merge: 0026d1a67 53a807e1e
Author: Nick Mathewson 
Date:   Tue Mar 13 13:41:11 2018 +0100

Merge branch 'bug25474_032' into maint-0.3.2

 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.3.2] Add a missing prototype to our libevent configure stanza.

[nickm]

commit 53a807e1e94e01bf3ea7e90d1203b952eee929b0
Author: Nick Mathewson 
Date:   Tue Mar 13 13:37:26 2018 +0100

Add a missing prototype to our libevent configure stanza.

Fixes bug 25474; bugfix on 0.3.2.5-alpha.
---
 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/bug25474 b/changes/bug25474
new file mode 100644
index 0..7d3bd1c5f
--- /dev/null
+++ b/changes/bug25474
@@ -0,0 +1,5 @@
+  o Minor bugfixes (compilation):
+- Fix a c99 compliance issue in our configuration script that was
+  causing compilation issues when compiling Tor with certain
+  versions of xtools. Fixes bug 25474; bugfix on 0.3.2.5-alpha.
+
diff --git a/configure.ac b/configure.ac
index 5a74d6c61..b5cacd06a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -631,7 +631,8 @@ TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent 
$STATIC_LIBEVENT_FLAGS $T
 #include 
 #endif
 struct event_base;
-struct event_base *event_base_new(void);],
+struct event_base *event_base_new(void);
+void event_base_free(struct event_base *);],
 [
 #ifdef _WIN32
 {WSADATA d; WSAStartup(0x101,); }



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

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm]

commit 4a03851e42afcb75525b4c4ca2331e75fb19fadf
Merge: 2d42648ea 094294dbb
Author: Nick Mathewson 
Date:   Tue Mar 13 13:42:06 2018 +0100

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 676a28599dcc3854a98c684808055db76dcd265b
Merge: e9dbd6dd8 094294dbb
Author: Nick Mathewson 
Date:   Tue Mar 13 13:41:24 2018 +0100

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)




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

[tor-commits] [tor/maint-0.3.3] Add a missing prototype to our libevent configure stanza.

[nickm]

commit 53a807e1e94e01bf3ea7e90d1203b952eee929b0
Author: Nick Mathewson 
Date:   Tue Mar 13 13:37:26 2018 +0100

Add a missing prototype to our libevent configure stanza.

Fixes bug 25474; bugfix on 0.3.2.5-alpha.
---
 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/bug25474 b/changes/bug25474
new file mode 100644
index 0..7d3bd1c5f
--- /dev/null
+++ b/changes/bug25474
@@ -0,0 +1,5 @@
+  o Minor bugfixes (compilation):
+- Fix a c99 compliance issue in our configuration script that was
+  causing compilation issues when compiling Tor with certain
+  versions of xtools. Fixes bug 25474; bugfix on 0.3.2.5-alpha.
+
diff --git a/configure.ac b/configure.ac
index 5a74d6c61..b5cacd06a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -631,7 +631,8 @@ TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent 
$STATIC_LIBEVENT_FLAGS $T
 #include 
 #endif
 struct event_base;
-struct event_base *event_base_new(void);],
+struct event_base *event_base_new(void);
+void event_base_free(struct event_base *);],
 [
 #ifdef _WIN32
 {WSADATA d; WSAStartup(0x101,); }



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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 676a28599dcc3854a98c684808055db76dcd265b
Merge: e9dbd6dd8 094294dbb
Author: Nick Mathewson 
Date:   Tue Mar 13 13:41:24 2018 +0100

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)




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

[tor-commits] [tor/master] Merge branch 'bug25474_032' into maint-0.3.2

[nickm]

commit 094294dbb1e631d9b11ee8dbc3f70ccb9f290c54
Merge: 0026d1a67 53a807e1e
Author: Nick Mathewson 
Date:   Tue Mar 13 13:41:11 2018 +0100

Merge branch 'bug25474_032' into maint-0.3.2

 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.3.2] Merge branch 'bug25474_032' into maint-0.3.2

[nickm]

commit 094294dbb1e631d9b11ee8dbc3f70ccb9f290c54
Merge: 0026d1a67 53a807e1e
Author: Nick Mathewson 
Date:   Tue Mar 13 13:41:11 2018 +0100

Merge branch 'bug25474_032' into maint-0.3.2

 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 676a28599dcc3854a98c684808055db76dcd265b
Merge: e9dbd6dd8 094294dbb
Author: Nick Mathewson 
Date:   Tue Mar 13 13:41:24 2018 +0100

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.3.2] Merge branch 'bug25474_032' into maint-0.3.2

[nickm]

commit 094294dbb1e631d9b11ee8dbc3f70ccb9f290c54
Merge: 0026d1a67 53a807e1e
Author: Nick Mathewson 
Date:   Tue Mar 13 13:41:11 2018 +0100

Merge branch 'bug25474_032' into maint-0.3.2

 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.3.2] Add a missing prototype to our libevent configure stanza.

[nickm]

commit 53a807e1e94e01bf3ea7e90d1203b952eee929b0
Author: Nick Mathewson 
Date:   Tue Mar 13 13:37:26 2018 +0100

Add a missing prototype to our libevent configure stanza.

Fixes bug 25474; bugfix on 0.3.2.5-alpha.
---
 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/bug25474 b/changes/bug25474
new file mode 100644
index 0..7d3bd1c5f
--- /dev/null
+++ b/changes/bug25474
@@ -0,0 +1,5 @@
+  o Minor bugfixes (compilation):
+- Fix a c99 compliance issue in our configuration script that was
+  causing compilation issues when compiling Tor with certain
+  versions of xtools. Fixes bug 25474; bugfix on 0.3.2.5-alpha.
+
diff --git a/configure.ac b/configure.ac
index 5a74d6c61..b5cacd06a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -631,7 +631,8 @@ TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent 
$STATIC_LIBEVENT_FLAGS $T
 #include 
 #endif
 struct event_base;
-struct event_base *event_base_new(void);],
+struct event_base *event_base_new(void);
+void event_base_free(struct event_base *);],
 [
 #ifdef _WIN32
 {WSADATA d; WSAStartup(0x101,); }



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

[tor-commits] [webwml/master] Fix cummunity liaison job post

[hiro]

commit 4183eae4fbeb7cfc31cc4ce0e6d7cb7331019892
Author: hiromipaw 
Date:   Tue Mar 13 13:23:20 2018 +0100

Fix cummunity liaison job post
---
 about/en/jobs-communityliaison.wml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/about/en/jobs-communityliaison.wml 
b/about/en/jobs-communityliaison.wml
index 549c6f45..09b2396d 100644
--- a/about/en/jobs-communityliaison.wml
+++ b/about/en/jobs-communityliaison.wml
@@ -26,7 +26,6 @@
   Willing and able to travel internationally
   Largely self-directed, motivated, and organized
 
-This position will be working closely with the UX and Community teams 
to define the best methods to test our hypotheses with our users. This position 
will report to the Community Team Lead and may be performed from anywhere in 
the world.
 The Tor Project, Inc., is a 501(c)(3) organization headquartered in 
Seattle that provides the technical infrastructure for privacy protection over 
the Internet, helping millions of activists, journalists and others around the 
world communicate securely. With paid staff and contractors of around 35 
engineers and operational support people, plus many volunteers all over the 
world who contribute to our work, the Tor Project is funded in part by 
government grants and contracts, as well as by individual, foundation, and 
corporate donations. Our mission is “To advance human rights and freedoms by 
creating and deploying free and open anonymity and privacy technologies, 
supporting their unrestricted availability and use, and furthering their 
scientific and popular understanding.”
 Salary is commensurate with experience and other qualifications. The 
Tor Project has a competitive benefits package, including a generous PTO 
policy; 14 paid holidays per year (including the week between Christmas and New 
Year's, when the office is closed); health, vision, dental, disability, and 
life insurance paid in full for employee; flexible work schedule; and 
occasional travel opportunities. The Tor Project, Inc., is an equal 
opportunity, affirmative action employer.
 This is a part-time position working remotely. To apply, send a cover 
letter explaining why you believe you should be our Community Liaison, along 
with your resume, to h...@torproject.org with “Community Liaison” in the 
subject line. No phone calls please!

___
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 f5fba73c82ae31ade1b929be8388cf446c56c8e1
Author: Translation commit bot 
Date:   Tue Mar 13 12:17:13 2018 +

Update translations for tails-misc_completed
---
 ca.po | 34 +-
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/ca.po b/ca.po
index 626cf1f02..04b7776fa 100644
--- a/ca.po
+++ b/ca.po
@@ -10,14 +10,15 @@
 # Guillem Arias Fauste , 2016
 # Humbert , 2014
 # laia_, 2014-2016
+# Miquel Bosch , 2018
 # Vte A.F , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-01 16:34+0100\n"
-"PO-Revision-Date: 2018-03-12 22:02+\n"
-"Last-Translator: Ecron \n"
+"POT-Creation-Date: 2018-03-12 19:03+0100\n"
+"PO-Revision-Date: 2018-03-13 11:53+\n"
+"Last-Translator: Miquel Bosch \n"
 "Language-Team: Catalan 
(http://www.transifex.com/otf/torproject/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,7 +81,6 @@ msgid "Restart"
 msgstr "Reinicia"
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:78
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:147
 msgid "Lock screen"
 msgstr "Bloca la pantalla"
 
@@ -204,22 +204,30 @@ msgid ""
 msgstr "El falsejament de la identitat de l'adreça MAC ha fallat per la 
targeta de xarxa ${nic_name} (${nic}). També ha fallat la recuperació 
d'errors i tot el treball en xarxa està desactivat.\nPotser preferireu 
reiniciar el Tails i desactivar el falsejament de l'adreça MAC "
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109
-msgid "Set up a password to unlock the screen"
-msgstr "Establiu una contrasenya per a desblocar la pantalla"
+msgid "Lock Screen"
+msgstr "Bloca la pantalla"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124
+msgid "Screen Locker"
+msgstr "Bloqueig de la pantalla"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:115
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
+msgid "Set up a password to unlock the screen."
+msgstr "Establiu una contrasenya per a desblocar la pantalla."
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
 msgid "Password"
 msgstr "Contrasenya"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:122
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:141
 msgid "Confirm"
 msgstr "Confirma"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:155
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancel·la"
-
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:35
 msgid ""
 "\"Not enough memory available to check for upgrades.\n"

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

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

[translation]

commit 845fdb22c9099c719b7c0eef812bc63ac90b85e6
Author: Translation commit bot 
Date:   Tue Mar 13 12:17:06 2018 +

Update translations for tails-misc
---
 ca.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ca.po b/ca.po
index 2872e360a..04b7776fa 100644
--- a/ca.po
+++ b/ca.po
@@ -10,14 +10,15 @@
 # Guillem Arias Fauste , 2016
 # Humbert , 2014
 # laia_, 2014-2016
+# Miquel Bosch , 2018
 # Vte A.F , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-03-13 02:48+\n"
-"Last-Translator: Carles Sadurní \n"
+"PO-Revision-Date: 2018-03-13 11:53+\n"
+"Last-Translator: Miquel Bosch \n"
 "Language-Team: Catalan 
(http://www.transifex.com/otf/torproject/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -213,11 +214,11 @@ msgstr "Cancel·la"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124
 msgid "Screen Locker"
-msgstr ""
+msgstr "Bloqueig de la pantalla"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
 msgid "Set up a password to unlock the screen."
-msgstr ""
+msgstr "Establiu una contrasenya per a desblocar la pantalla."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
 msgid "Password"

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

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

[translation]

commit bdf726ac8e98bb47af54bd74741d75ff09e39b7d
Author: Translation commit bot 
Date:   Tue Mar 13 11:46:00 2018 +

Update translations for liveusb-creator_completed
---
 ca/ca.po | 25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ca/ca.po b/ca/ca.po
index 48b88e9bd..bcb2cf482 100644
--- a/ca/ca.po
+++ b/ca/ca.po
@@ -12,6 +12,7 @@
 # Guillem Arias Fauste , 2015-2016
 # josep constantí mata , 2015
 # laia_, 2015-2016
+# Miquel Bosch , 2018
 # Pau Sellés i Garcia , 2013
 # Vte A.F , 2017
 # F Xavier Castane , 2013
@@ -20,8 +21,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-10 15:57+0100\n"
-"PO-Revision-Date: 2017-11-11 03:09+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-03-13 11:45+\n"
+"Last-Translator: Miquel Bosch \n"
 "Language-Team: Catalan 
(http://www.transifex.com/otf/torproject/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -136,7 +137,7 @@ msgstr "El sistema de fitxers de %s no està suportat."
 #: ../tails_installer/creator.py:782
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
-msgstr "Error desconegut de GLib mentre s'intentava montar: %(message)s"
+msgstr "Error desconegut de GLib mentre s'intentava muntar: %(message)s"
 
 #: ../tails_installer/creator.py:786
 #, python-format
@@ -319,7 +320,7 @@ msgstr "Atenció: Aquesta eina necessita ser executada com 
Administrador. Per fe
 
 #: ../tails_installer/gui.py:375
 msgid "Tails Installer"
-msgstr "Instalador de Tails"
+msgstr "Instal·lador de Tails"
 
 #: ../tails_installer/gui.py:456
 msgid "Upgrade"
@@ -336,15 +337,15 @@ msgstr "Dispositiu %(size)s%(vendor)s%(model)s 
(%(device)s)"
 
 #: ../tails_installer/gui.py:481
 msgid "No ISO image selected"
-msgstr "No hi ha imatge d' ISO seleccionada"
+msgstr "No hi ha seleccionada cap imatge ISO"
 
 #: ../tails_installer/gui.py:482
 msgid "Please select a Tails ISO image."
-msgstr "Per favor, seleccioneu una imatge d' ISO de Tails."
+msgstr "Per favor, seleccioneu una imatge ISO de Tails."
 
 #: ../tails_installer/gui.py:521
 msgid "No device suitable to install Tails could be found"
-msgstr "No s'ha pogut trobar un dispositiu compatible per a instalar Tails."
+msgstr "No s'ha pogut trobar un dispositiu compatible per a instal·lar Tails."
 
 #: ../tails_installer/gui.py:523
 #, python-format
@@ -357,7 +358,7 @@ msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
 "manufacturer and Tails will fail to start on it. Please try installing on a "
 "different model."
-msgstr "La memòria USB \"%(pretty_name)s\" està configurada com a no 
extraíble pel propi fabricant i Tails no podrà executarse. Per favor, 
intenteu instalar-lo en un model diferent."
+msgstr "La memòria USB \"%(pretty_name)s\" està configurada com a no 
extraïble pel propi fabricant i Tails no podrà executar-se. Per favor, 
intenteu instal·lar-lo en un model diferent."
 
 #: ../tails_installer/gui.py:567
 #, python-format
@@ -384,7 +385,7 @@ msgstr "Instal·lació complerta!"
 
 #: ../tails_installer/gui.py:649
 msgid "Installation was completed."
-msgstr "La instal·lació ha estat completada"
+msgstr "La instal·lació ha estat completada."
 
 #: ../tails_installer/gui.py:698
 msgid "Unable to mount device"
@@ -478,7 +479,7 @@ msgstr "'%s' no és un directori."
 #: ../tails_installer/source.py:75
 #, python-format
 msgid "Skipping '%(filename)s'"
-msgstr "Omitint '%(filename)s'"
+msgstr "Ometent '%(filename)s'"
 
 #: ../tails_installer/utils.py:44
 #, python-format
@@ -509,8 +510,8 @@ msgstr "Seleccioneu una distribució per a descarregar:"
 
 #: ../data/tails-installer.ui.h:5
 msgid "Target USB stick:"
-msgstr "Memoria USB destí:"
+msgstr "Memòria USB de destí:"
 
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
-msgstr "Reinstal·lar (borrar tots els arxius)"
+msgstr "Reinstal·lar (esborrar tots els arxius)"

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

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

[translation]

commit 4e0df1937b027a4044989081ec436842cdb4ed25
Author: Translation commit bot 
Date:   Tue Mar 13 11:45:54 2018 +

Update translations for liveusb-creator
---
 ca/ca.po | 25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ca/ca.po b/ca/ca.po
index 48b88e9bd..bcb2cf482 100644
--- a/ca/ca.po
+++ b/ca/ca.po
@@ -12,6 +12,7 @@
 # Guillem Arias Fauste , 2015-2016
 # josep constantí mata , 2015
 # laia_, 2015-2016
+# Miquel Bosch , 2018
 # Pau Sellés i Garcia , 2013
 # Vte A.F , 2017
 # F Xavier Castane , 2013
@@ -20,8 +21,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-10 15:57+0100\n"
-"PO-Revision-Date: 2017-11-11 03:09+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-03-13 11:45+\n"
+"Last-Translator: Miquel Bosch \n"
 "Language-Team: Catalan 
(http://www.transifex.com/otf/torproject/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -136,7 +137,7 @@ msgstr "El sistema de fitxers de %s no està suportat."
 #: ../tails_installer/creator.py:782
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
-msgstr "Error desconegut de GLib mentre s'intentava montar: %(message)s"
+msgstr "Error desconegut de GLib mentre s'intentava muntar: %(message)s"
 
 #: ../tails_installer/creator.py:786
 #, python-format
@@ -319,7 +320,7 @@ msgstr "Atenció: Aquesta eina necessita ser executada com 
Administrador. Per fe
 
 #: ../tails_installer/gui.py:375
 msgid "Tails Installer"
-msgstr "Instalador de Tails"
+msgstr "Instal·lador de Tails"
 
 #: ../tails_installer/gui.py:456
 msgid "Upgrade"
@@ -336,15 +337,15 @@ msgstr "Dispositiu %(size)s%(vendor)s%(model)s 
(%(device)s)"
 
 #: ../tails_installer/gui.py:481
 msgid "No ISO image selected"
-msgstr "No hi ha imatge d' ISO seleccionada"
+msgstr "No hi ha seleccionada cap imatge ISO"
 
 #: ../tails_installer/gui.py:482
 msgid "Please select a Tails ISO image."
-msgstr "Per favor, seleccioneu una imatge d' ISO de Tails."
+msgstr "Per favor, seleccioneu una imatge ISO de Tails."
 
 #: ../tails_installer/gui.py:521
 msgid "No device suitable to install Tails could be found"
-msgstr "No s'ha pogut trobar un dispositiu compatible per a instalar Tails."
+msgstr "No s'ha pogut trobar un dispositiu compatible per a instal·lar Tails."
 
 #: ../tails_installer/gui.py:523
 #, python-format
@@ -357,7 +358,7 @@ msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
 "manufacturer and Tails will fail to start on it. Please try installing on a "
 "different model."
-msgstr "La memòria USB \"%(pretty_name)s\" està configurada com a no 
extraíble pel propi fabricant i Tails no podrà executarse. Per favor, 
intenteu instalar-lo en un model diferent."
+msgstr "La memòria USB \"%(pretty_name)s\" està configurada com a no 
extraïble pel propi fabricant i Tails no podrà executar-se. Per favor, 
intenteu instal·lar-lo en un model diferent."
 
 #: ../tails_installer/gui.py:567
 #, python-format
@@ -384,7 +385,7 @@ msgstr "Instal·lació complerta!"
 
 #: ../tails_installer/gui.py:649
 msgid "Installation was completed."
-msgstr "La instal·lació ha estat completada"
+msgstr "La instal·lació ha estat completada."
 
 #: ../tails_installer/gui.py:698
 msgid "Unable to mount device"
@@ -478,7 +479,7 @@ msgstr "'%s' no és un directori."
 #: ../tails_installer/source.py:75
 #, python-format
 msgid "Skipping '%(filename)s'"
-msgstr "Omitint '%(filename)s'"
+msgstr "Ometent '%(filename)s'"
 
 #: ../tails_installer/utils.py:44
 #, python-format
@@ -509,8 +510,8 @@ msgstr "Seleccioneu una distribució per a descarregar:"
 
 #: ../data/tails-installer.ui.h:5
 msgid "Target USB stick:"
-msgstr "Memoria USB destí:"
+msgstr "Memòria USB de destí:"
 
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
-msgstr "Reinstal·lar (borrar tots els arxius)"
+msgstr "Reinstal·lar (esborrar tots els arxius)"

___
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 7675300c31e76bb271fd8398dc49eb805e266962
Author: Translation commit bot 
Date:   Tue Mar 13 09:17:12 2018 +

Update translations for tails-misc_completed
---
 es.po | 33 -
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/es.po b/es.po
index b787e130e..1529337a2 100644
--- a/es.po
+++ b/es.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-01 16:34+0100\n"
-"PO-Revision-Date: 2018-03-03 15:47+\n"
-"Last-Translator: Emma Peel\n"
+"POT-Creation-Date: 2018-03-12 19:03+0100\n"
+"PO-Revision-Date: 2018-03-13 09:11+\n"
+"Last-Translator: strel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,7 +80,6 @@ msgid "Restart"
 msgstr "Reiniciar"
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:78
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:147
 msgid "Lock screen"
 msgstr "Bloquear pantalla"
 
@@ -204,22 +203,30 @@ msgid ""
 msgstr "Falló el MAC spoofing para la tarjeta de red ${nic_name} (${nic}). La 
recuperación de errores también falló porque toda la red está 
deshabilitada.\nQuizás prefieras reiniciar Tails y deshabilitar el MAC 
spoofing."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109
-msgid "Set up a password to unlock the screen"
-msgstr "Establece una contraseña para desbloquear la pantalla"
+msgid "Lock Screen"
+msgstr "Pantalla de bloqueo"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:115
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124
+msgid "Screen Locker"
+msgstr "Bloqueo de pantalla"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
+msgid "Set up a password to unlock the screen."
+msgstr "Establezca una contraseña para desbloquear la pantalla."
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
 msgid "Password"
 msgstr "Contraseña"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:122
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:141
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:155
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:35
 msgid ""
 "\"Not enough memory available to check for upgrades.\n"

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

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

[translation]

commit fb4fadd99346148ecbe2486b4387c29bbee31c11
Author: Translation commit bot 
Date:   Tue Mar 13 09:17:06 2018 +

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

diff --git a/es.po b/es.po
index 07dca6bb9..1529337a2 100644
--- a/es.po
+++ b/es.po
@@ -16,8 +16,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-03-13 02:48+\n"
-"Last-Translator: Roberto M.F.\n"
+"PO-Revision-Date: 2018-03-13 09:11+\n"
+"Last-Translator: strel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -213,11 +213,11 @@ msgstr "Cancelar"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124
 msgid "Screen Locker"
-msgstr ""
+msgstr "Bloqueo de pantalla"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
 msgid "Set up a password to unlock the screen."
-msgstr ""
+msgstr "Establezca una contraseña para desbloquear la pantalla."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
 msgid "Password"

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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm]

commit ed73b086b786e2a9248a19f8b8f29272096cd196
Merge: 6d44cf66c e9dbd6dd8
Author: Nick Mathewson 
Date:   Tue Mar 13 10:01:30 2018 +0100

Merge branch 'maint-0.3.3' into release-0.3.3

 src/or/tor_api.h | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

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

[tor-commits] [tor/release-0.3.3] Update the documentation in tor_api.h

[nickm]

commit e9dbd6dd8f365a71a3e569d26b12ed5e4a6419ce
Author: Nick Mathewson 
Date:   Tue Mar 13 10:00:41 2018 +0100

Update the documentation in tor_api.h
---
 src/or/tor_api.h | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/or/tor_api.h b/src/or/tor_api.h
index 7e86c7fec..6d4a9518e 100644
--- a/src/or/tor_api.h
+++ b/src/or/tor_api.h
@@ -66,14 +66,12 @@ void tor_main_configuration_free(tor_main_configuration_t 
*cfg);
  * This function will not return until Tor is done running.  It returns zero
  * on success, and nonzero on failure.
  *
- * BUG 23848: In many cases, tor_main will call exit() or abort() instead of
- * returning.  This is not the intended long-term behavior; we are trying to
- * fix it.
- *
- * BUG 23847: You can only call tor_main() once in a single process; if it
- * returns and you call it again, you may crash, or you may encounter other
- * unexpected behavior, including possible security issues.  This is not
- * intended long-term behavior; we are trying to fix it.
+ * If you want to control when Tor exits, make sure to configure a control
+ * socket. The OwningControllerFD option may be helpful there.
+ *
+ * BUG 23847: Sometimes, if you call tor_main a second time (after it has
+ * returned), Tor may crash or behave strangely.  We have fixed all issues of
+ * this type that we could find, but more may remain.
  *
  * LIMITATION: You cannot run more than one instance of Tor in the same
  * process at the same time. Concurrent calls will cause undefined behavior.



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

[tor-commits] [tor/maint-0.3.3] Update the documentation in tor_api.h

[nickm]

commit e9dbd6dd8f365a71a3e569d26b12ed5e4a6419ce
Author: Nick Mathewson 
Date:   Tue Mar 13 10:00:41 2018 +0100

Update the documentation in tor_api.h
---
 src/or/tor_api.h | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/or/tor_api.h b/src/or/tor_api.h
index 7e86c7fec..6d4a9518e 100644
--- a/src/or/tor_api.h
+++ b/src/or/tor_api.h
@@ -66,14 +66,12 @@ void tor_main_configuration_free(tor_main_configuration_t 
*cfg);
  * This function will not return until Tor is done running.  It returns zero
  * on success, and nonzero on failure.
  *
- * BUG 23848: In many cases, tor_main will call exit() or abort() instead of
- * returning.  This is not the intended long-term behavior; we are trying to
- * fix it.
- *
- * BUG 23847: You can only call tor_main() once in a single process; if it
- * returns and you call it again, you may crash, or you may encounter other
- * unexpected behavior, including possible security issues.  This is not
- * intended long-term behavior; we are trying to fix it.
+ * If you want to control when Tor exits, make sure to configure a control
+ * socket. The OwningControllerFD option may be helpful there.
+ *
+ * BUG 23847: Sometimes, if you call tor_main a second time (after it has
+ * returned), Tor may crash or behave strangely.  We have fixed all issues of
+ * this type that we could find, but more may remain.
  *
  * LIMITATION: You cannot run more than one instance of Tor in the same
  * process at the same time. Concurrent calls will cause undefined behavior.

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

[tor-commits] [tor/master] Update the documentation in tor_api.h

[nickm]

commit e9dbd6dd8f365a71a3e569d26b12ed5e4a6419ce
Author: Nick Mathewson 
Date:   Tue Mar 13 10:00:41 2018 +0100

Update the documentation in tor_api.h
---
 src/or/tor_api.h | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/or/tor_api.h b/src/or/tor_api.h
index 7e86c7fec..6d4a9518e 100644
--- a/src/or/tor_api.h
+++ b/src/or/tor_api.h
@@ -66,14 +66,12 @@ void tor_main_configuration_free(tor_main_configuration_t 
*cfg);
  * This function will not return until Tor is done running.  It returns zero
  * on success, and nonzero on failure.
  *
- * BUG 23848: In many cases, tor_main will call exit() or abort() instead of
- * returning.  This is not the intended long-term behavior; we are trying to
- * fix it.
- *
- * BUG 23847: You can only call tor_main() once in a single process; if it
- * returns and you call it again, you may crash, or you may encounter other
- * unexpected behavior, including possible security issues.  This is not
- * intended long-term behavior; we are trying to fix it.
+ * If you want to control when Tor exits, make sure to configure a control
+ * socket. The OwningControllerFD option may be helpful there.
+ *
+ * BUG 23847: Sometimes, if you call tor_main a second time (after it has
+ * returned), Tor may crash or behave strangely.  We have fixed all issues of
+ * this type that we could find, but more may remain.
  *
  * LIMITATION: You cannot run more than one instance of Tor in the same
  * process at the same time. Concurrent calls will cause undefined behavior.



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

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm]

commit 40154c1f9eeb378f5aac11c23ed26215ddfc26f3
Merge: 699bb803b e9dbd6dd8
Author: Nick Mathewson 
Date:   Tue Mar 13 10:00:58 2018 +0100

Merge branch 'maint-0.3.3'

 src/or/tor_api.h | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

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