February 2020 - tor-commits - lists.torproject.org

[snowflake/master] Rewrite websocketconn with synchronous pipes.
by dcf＠torproject.org 05 Feb '20

05 Feb '20

commit 01e28aa4604fea7a2af0259c8b18be1bd5f9b3d7 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Feb 3 12:31:00 2020 -0700 Rewrite websocketconn with synchronous pipes. Makes the following changes: * permits concurrent Read/Write/Close * converts certain CloseErrors into io.EOF https://bugs.torproject.org/33144 --- common/websocketconn/websocketconn.go | 122 +++++++++++++++++++++++----------- 1 file changed, 82 insertions(+), 40 deletions(-) diff --git a/common/websocketconn/websocketconn.go b/common/websocketconn/websocketconn.go index b87e657..fa2b0da 100644 --- a/common/websocketconn/websocketconn.go +++ b/common/websocketconn/websocketconn.go @@ -10,61 +10,103 @@ import ( // An abstraction that makes an underlying WebSocket connection look like an // io.ReadWriteCloser. type Conn struct { - Ws *websocket.Conn - r io.Reader + ws *websocket.Conn + Reader io.Reader + Writer io.Writer } // Implements io.Reader. func (conn *Conn) Read(b []byte) (n int, err error) { - var opCode int - if conn.r == nil { - // New message - var r io.Reader - for { - if opCode, r, err = conn.Ws.NextReader(); err != nil { - return - } - if opCode != websocket.BinaryMessage && opCode != websocket.TextMessage { - continue - } - - conn.r = r - break - } - } - - n, err = conn.r.Read(b) - if err == io.EOF { - // Message finished - conn.r = nil - err = nil - } - return + return conn.Reader.Read(b) } // Implements io.Writer. func (conn *Conn) Write(b []byte) (n int, err error) { - var w io.WriteCloser - if w, err = conn.Ws.NextWriter(websocket.BinaryMessage); err != nil { - return - } - if n, err = w.Write(b); err != nil { - return - } - err = w.Close() - return + return conn.Writer.Write(b) } // Implements io.Closer. func (conn *Conn) Close() error { // Ignore any error in trying to write a Close frame. - _ = conn.Ws.WriteControl(websocket.CloseMessage, []byte{}, time.Now().Add(time.Second)) - return conn.Ws.Close() + _ = conn.ws.WriteControl(websocket.CloseMessage, []byte{}, time.Now().Add(time.Second)) + return conn.ws.Close() +} + +func readLoop(w io.Writer, ws *websocket.Conn) error { + for { + messageType, r, err := ws.NextReader() + if err != nil { + return err + } + if messageType != websocket.BinaryMessage && messageType != websocket.TextMessage { + continue + } + _, err = io.Copy(w, r) + if err != nil { + return err + } + } + return nil +} + +func writeLoop(ws *websocket.Conn, r io.Reader) error { + for { + var buf [2048]byte + n, err := r.Read(buf[:]) + if err != nil { + return err + } + data := buf[:n] + w, err := ws.NextWriter(websocket.BinaryMessage) + if err != nil { + return err + } + n, err = w.Write(data) + if err != nil { + return err + } + err = w.Close() + if err != nil { + return err + } + } +} + +// websocket.Conn methods start returning websocket.CloseError after the +// connection has been closed. We want to instead interpret that as io.EOF, just +// as you would find with a normal net.Conn. This only converts +// websocket.CloseErrors with known codes; other codes like CloseProtocolError +// and CloseAbnormalClosure will still be reported as anomalous. +func closeErrorToEOF(err error) error { + if websocket.IsCloseError(err, websocket.CloseNormalClosure, websocket.CloseNoStatusReceived) { + err = io.EOF + } + return err } // Create a new Conn. func New(ws *websocket.Conn) *Conn { - var conn Conn - conn.Ws = ws - return &conn + // Set up synchronous pipes to serialize reads and writes to the + // underlying websocket.Conn. + // + // https://godoc.org/github.com/gorilla/websocket#hdr-Concurrency + // "Connections support one concurrent reader and one concurrent writer. + // Applications are responsible for ensuring that no more than one + // goroutine calls the write methods (NextWriter, etc.) concurrently and + // that no more than one goroutine calls the read methods (NextReader, + // etc.) concurrently. The Close and WriteControl methods can be called + // concurrently with all other methods." + pr1, pw1 := io.Pipe() + go func() { + pw1.CloseWithError(closeErrorToEOF(readLoop(pw1, ws))) + }() + pr2, pw2 := io.Pipe() + go func() { + pr2.CloseWithError(closeErrorToEOF(writeLoop(ws, pr2))) + }() + return &Conn{ + ws: ws, + Reader: pr1, + Writer: pw2, + } }

1 0

[snowflake/master] websocketconn tests.
by dcf＠torproject.org 05 Feb '20

05 Feb '20

commit 5708a1d57b53d6d586d0e98be9a0b5a964e7c6c3 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Feb 3 12:06:08 2020 -0700 websocketconn tests. https://bugs.torproject.org/33144 --- common/websocketconn/websocketconn_test.go | 235 +++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+) diff --git a/common/websocketconn/websocketconn_test.go b/common/websocketconn/websocketconn_test.go new file mode 100644 index 0000000..ad6f100 --- /dev/null +++ b/common/websocketconn/websocketconn_test.go @@ -0,0 +1,235 @@ +package websocketconn + +import ( + "bytes" + "fmt" + "io" + "io/ioutil" + "net" + "net/http" + "net/url" + "sync" + "testing" + "time" + + "github.com/gorilla/websocket" +) + +// Returns a (server, client) pair of websocketconn.Conns. +func connPair() (*Conn, *Conn, error) { + // Will be assigned inside server.Handler. + var serverConn *Conn + + // Start up a web server to receive the request. + ln, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + return nil, nil, err + } + defer ln.Close() + errCh := make(chan error) + server := http.Server{ + Handler: http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { + upgrader := websocket.Upgrader{ + CheckOrigin: func(*http.Request) bool { return true }, + } + ws, err := upgrader.Upgrade(rw, req, nil) + if err != nil { + errCh <- err + return + } + serverConn = New(ws) + close(errCh) + }), + } + defer server.Close() + go func() { + err := server.Serve(ln) + if err != nil && err != http.ErrServerClosed { + errCh <- err + } + }() + + // Make a request to the web server. + urlStr := (&url.URL{Scheme: "ws", Host: ln.Addr().String()}).String() + ws, _, err := (&websocket.Dialer{}).Dial(urlStr, nil) + if err != nil { + return nil, nil, err + } + clientConn := New(ws) + + // The server is finished when errCh is written to or closed. + err = <-errCh + if err != nil { + return nil, nil, err + } + return serverConn, clientConn, nil +} + +// Test that you can write in chunks and read the result concatenated. +func TestWrite(t *testing.T) { + tests := [][][]byte{ + {}, + {[]byte("foo")}, + {[]byte("foo"), []byte("bar")}, + {{}, []byte("foo"), {}, {}, []byte("bar")}, + } + + for _, test := range tests { + s, c, err := connPair() + if err != nil { + t.Fatal(err) + } + + // This is a little awkward because we need to read to and write + // from both ends of the Conn, and we need to do it in separate + // goroutines because otherwise a Write may block waiting for + // someone to Read it. Here we set up a loop in a separate + // goroutine, reading from the Conn s and writing to the dataCh + // and errCh channels, whose ultimate effect in the select loop + // below is like + // data, err := ioutil.ReadAll(s) + dataCh := make(chan []byte) + errCh := make(chan error) + go func() { + for { + var buf [1024]byte + n, err := s.Read(buf[:]) + if err != nil { + errCh <- err + return + } + p := make([]byte, n) + copy(p, buf[:]) + dataCh <- p + } + }() + + // Write the data to the client side of the Conn, one chunk at a + // time. + for i, chunk := range test { + n, err := c.Write(chunk) + if err != nil || n != len(chunk) { + t.Fatalf("%+q Write chunk %d: got (%d, %v), expected (%d, %v)", + test, i, n, err, len(chunk), nil) + } + } + // We cannot immediately c.Close here, because that closes the + // connection right away, without waiting for buffered data to + // be sent. + + // Pull data and err from the server goroutine above. + var data []byte + err = nil + loop: + for { + select { + case p := <-dataCh: + data = append(data, p...) + case err = <-errCh: + break loop + case <-time.After(100 * time.Millisecond): + break loop + } + } + s.Close() + c.Close() + + // Now data and err contain the result of reading everything + // from s. + expected := bytes.Join(test, []byte{}) + if err != nil || !bytes.Equal(data, expected) { + t.Fatalf("%+q ReadAll: got (%+q, %v), expected (%+q, %v)", + test, data, err, expected, nil) + } + } +} + +// Test that multiple goroutines may call Read on a Conn simultaneously. Run +// this with +// go test -race +func TestConcurrentRead(t *testing.T) { + s, c, err := connPair() + if err != nil { + t.Fatal(err) + } + defer s.Close() + + // Set up multiple threads reading from the same conn. + errCh := make(chan error, 2) + var wg sync.WaitGroup + wg.Add(2) + for i := 0; i < 2; i++ { + go func() { + defer wg.Done() + _, err := io.Copy(ioutil.Discard, s) + if err != nil { + errCh <- err + } + }() + } + + // Write a bunch of data to the other end. + for i := 0; i < 2000; i++ { + _, err := fmt.Fprintf(c, "%d", i) + if err != nil { + c.Close() + t.Fatalf("Write: %v", err) + } + } + c.Close() + + wg.Wait() + close(errCh) + + err = <-errCh + if err != nil { + t.Fatalf("Read: %v", err) + } +} + +// Test that multiple goroutines may call Write on a Conn simultaneously. Run +// this with +// go test -race +func TestConcurrentWrite(t *testing.T) { + s, c, err := connPair() + if err != nil { + t.Fatal(err) + } + + // Set up multiple threads writing to the same conn. + errCh := make(chan error, 3) + var wg sync.WaitGroup + wg.Add(2) + for i := 0; i < 2; i++ { + go func() { + defer wg.Done() + for j := 0; j < 1000; j++ { + _, err := fmt.Fprintf(s, "%d", j) + if err != nil { + errCh <- err + break + } + } + }() + } + go func() { + wg.Wait() + err := s.Close() + if err != nil { + errCh <- err + } + close(errCh) + }() + + // Read from the other end. + _, err = io.Copy(ioutil.Discard, c) + c.Close() + if err != nil { + t.Fatalf("Read: %v", err) + } + + err = <-errCh + if err != nil { + t.Fatalf("Write: %v", err) + } +}

1 0

[snowflake/master] Implement net.Conn for websocketconn.Conn.
by dcf＠torproject.org 05 Feb '20

05 Feb '20

commit 256959ca6594dddd9fe5b012680b4f0235401cd9 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Feb 3 13:22:03 2020 -0700 Implement net.Conn for websocketconn.Conn. We had already implemented Read, Write, and Close. Pass RemoteAddr, LocalAddr, SetReadDeadline, and SetWriteDeadline through to the underlying *websocket.Conn. Implement SetDeadline by calling both SetReadDeadline and SetWriteDeadline. https://bugs.torproject.org/33144 --- common/websocketconn/websocketconn.go | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/common/websocketconn/websocketconn.go b/common/websocketconn/websocketconn.go index fa2b0da..73c2b25 100644 --- a/common/websocketconn/websocketconn.go +++ b/common/websocketconn/websocketconn.go @@ -7,29 +7,36 @@ import ( "github.com/gorilla/websocket" ) -// An abstraction that makes an underlying WebSocket connection look like an -// io.ReadWriteCloser. +// An abstraction that makes an underlying WebSocket connection look like a +// net.Conn. type Conn struct { - ws *websocket.Conn + *websocket.Conn Reader io.Reader Writer io.Writer } -// Implements io.Reader. func (conn *Conn) Read(b []byte) (n int, err error) { return conn.Reader.Read(b) } -// Implements io.Writer. func (conn *Conn) Write(b []byte) (n int, err error) { return conn.Writer.Write(b) } -// Implements io.Closer. func (conn *Conn) Close() error { // Ignore any error in trying to write a Close frame. - _ = conn.ws.WriteControl(websocket.CloseMessage, []byte{}, time.Now().Add(time.Second)) - return conn.ws.Close() + _ = conn.Conn.WriteControl(websocket.CloseMessage, []byte{}, time.Now().Add(time.Second)) + return conn.Conn.Close() +} + +func (conn *Conn) SetDeadline(t time.Time) error { + errRead := conn.Conn.SetReadDeadline(t) + errWrite := conn.Conn.SetWriteDeadline(t) + err := errRead + if err == nil { + err = errWrite + } + return err } func readLoop(w io.Writer, ws *websocket.Conn) error { @@ -105,7 +112,7 @@ func New(ws *websocket.Conn) *Conn { pr2.CloseWithError(closeErrorToEOF(writeLoop(ws, pr2))) }() return &Conn{ - ws: ws, + Conn: ws, Reader: pr1, Writer: pw2, }

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 05 Feb '20

05 Feb '20

commit e12cf3edf79fb8de0ead076204d543a94e8a5c54 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 4 21:45:28 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+de.po | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/contents+de.po b/contents+de.po index ddacd7f5aa..93886b5d06 100644 --- a/contents+de.po +++ b/contents+de.po @@ -952,6 +952,9 @@ msgid "" "usage can be highly customized in the tor configuration (will be covered in " "more detail later in this guide)." msgstr "" +"Ein Non-Exit-Tor-Relay erfordert nur minimalen Wartungsaufwand und die " +"Bandbreitennutzung kann in der Tor-Konfiguration in hohem Maße angepasst " +"werden (wird später in diesem Leitfaden ausführlicher behandelt)." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -959,11 +962,13 @@ msgid "" "The so called \"exit policy\" of the relay decides if it is a relay allowing" " clients to exit or not." msgstr "" +"Die so genannte \"Exit-Richtlinie\" des Relays entscheidet, ob es sich um " +"ein Relay handelt, das den Kunden den Ausgang erlaubt oder nicht." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "A non-exit relay does not allow exiting in its exit policy." -msgstr "" +msgstr "Ein Non-Exit-Relay erlaubt in seiner Exit-Richtlinie keinen Ausgang." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -976,6 +981,8 @@ msgid "" "The exit relay is the final relay in a Tor circuit, the one that sends " "traffic out its destination." msgstr "" +"Die Exit-Relays sind die letzten Relays in einem Tor-Kanal, die den Verkehr " +"an sein Ziel senden." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -984,6 +991,9 @@ msgid "" "provider, etc) will see the IP address of the exit relay instead of their " "real IP address of the Tor user." msgstr "" +"Die Dienste, mit denen sich die Tor-Clients verbinden (Webseite, Chat-" +"Dienst, E-Mail-Anbieter, usw.) sehen die IP-Adresse des Exit-Relays statt " +"der realen IP-Adresse des Tor-Benutzers." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -991,6 +1001,8 @@ msgid "" "Exit relays have the greatest legal exposure and liability of all the " "relays." msgstr "" +"Die Exit-Relays haben von allen Relays die größte rechtliche Belastung und " +"Haftung." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1000,6 +1012,11 @@ msgid "" "notice](https://www.dmca.com/Solutions/view.aspx?ID=712f28a5-93f2-467b-" "ba92-3d58c8345a32&?ref=sol08a2)." msgstr "" +"Wenn ein Benutzer beispielsweise urheberrechtlich geschütztes Material " +"herunterlädt, während er dein Exit-Relay benutzt, erhältst du als die " +"betreibende Person möglicherweise eine [DMCA-Benachrichtigung] " +"(https://www.dmca.com/Solutions/view.aspx?ID=712f28a5-93f2-467b-" +"ba92-3d58c8345a32&?ref=sol08a2)." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1007,6 +1024,8 @@ msgid "" "Any abuse complaints about the exit will go directly to you (via your " "hoster, depending on the WHOIS records)." msgstr "" +"Jegliche Missbrauchsbeschwerden über den Ausgang gehen direkt an dich (über " +"deinen Hoster, abhängig von den WHOIS-Einträgen)." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1014,6 +1033,9 @@ msgid "" "Generally, most complaints can be handled pretty easily through template " "letters, which we'll discuss more in legal considerations section." msgstr "" +"Im Allgemeinen können die meisten Beschwerden ziemlich einfach mit Hilfe von" +" Musterbriefen bearbeitet werden, auf die wir im Abschnitt \"Rechtliche " +"Aspekte\" näher eingehen werden." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1021,6 +1043,9 @@ msgid "" "Because of the legal exposure that comes with running an exit relay, you " "should not run a Tor exit relay from your home." msgstr "" +"Wegen der rechtlichen Risiken, die mit dem Betrieb eines Exit-Relays " +"verbunden sind, solltest du keinen Tor-Exit Relay von zu Hause aus " +"betreiben." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1028,6 +1053,9 @@ msgid "" "Ideal exit relay operators are affiliated with some institution, like a " "university, a library, a hackerspace or a privacy related organization." msgstr "" +"Ideale Exit-Relay-Betreiber sind mit einer Institution verbunden, wie z.B. " +"einer Universität, einer Bibliothek, einem Hackerspace oder einer " +"Organisation, die mit dem Schutz der Privatsphäre zu tun hat." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1036,6 +1064,9 @@ msgid "" "better positioned to handle abuse complaints or the rare law enforcement " "inquiry." msgstr "" +"Eine Institution kann nicht nur eine größere Bandbreite für den Ausgang " +"bieten, sondern ist auch besser in der Lage, Beschwerden über Missbrauch " +"oder die seltene Untersuchung der Strafverfolgungsbehörden zu bearbeiten." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1043,6 +1074,9 @@ msgid "" "If you are considering running an exit relay, please read the [section on " "legal considerations](/relay/community-resources) for exit relay operators." msgstr "" +"Wenn du erwägst, ein Exit-Relay zu betreiben, lies bitte den [Abschnitt über" +" rechtliche Erwägungen](/relay/community-resources) für Exit-Relay-" +"Betreiber." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1055,6 +1089,8 @@ msgid "" "The design of the Tor network means that the IP address of Tor relays is " "public." msgstr "" +"Das Design des Tor-Netzwerkes bedeutet, dass die IP-Adresse der Tor-Relays " +"öffentlich ist." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1062,6 +1098,9 @@ msgid "" "However, one of the ways Tor can be blocked by governments or ISPs is by " "blacklisting the IP addresses of these public Tor nodes." msgstr "" +"Einer der Wege, wie Tor von Regierungen oder ISPs blockiert werden kann, " +"besteht jedoch darin, die IP-Adressen dieser öffentlichen Tor-Knoten auf " +"eine schwarze Liste zu setzen." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1069,6 +1108,9 @@ msgid "" "Tor bridges are nodes in the network that are not listed in the public Tor " "directory, which make it harder for ISPs and governments to block them." msgstr "" +"Tor-Brücken sind Knoten im Netzwerk, die nicht im öffentlichen Tor-" +"Verzeichnis aufgeführt sind, was es für ISPs und Regierungen schwieriger " +"macht, sie zu blockieren." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1077,6 +1119,10 @@ msgid "" "want an extra layer of security because they're worried somebody will " "recognize that they are contacting a public Tor relay IP address." msgstr "" +"Brücken sind nützlich für Tor-Benutzer unter repressiven Regimes oder für " +"Leute, die eine zusätzliche Sicherheitsebene wünschen, weil sie befürchten, " +"dass jemand erkennt, dass sie eine öffentliche Tor-Relay-IP-Adresse " +"kontaktieren." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 05 Feb '20

05 Feb '20

commit e47b6df0b422e82f4cdd2350b45e5c9e4f495c6a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 4 21:15:26 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+de.po | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/contents+de.po b/contents+de.po index fdce591360..ddacd7f5aa 100644 --- a/contents+de.po +++ b/contents+de.po @@ -802,16 +802,19 @@ msgid "" "Tor has no hard uptime requirement but if your relay is not running for more" " than 2 hours a day its usefulness is limited." msgstr "" +"Tor hat keine harten Anforderungen an die Betriebszeit, aber wenn dein Relay" +" nicht länger als 2 Stunden am Tag läuft, ist sein Nutzen begrenzt." #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "Ideally the relay runs on a server which runs 24/7." msgstr "" +"Im Idealfall läuft das Relay auf einem Server, der rund um die Uhr läuft." #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "Reboots and tor daemon restarts are fine." -msgstr "" +msgstr "Reboots und Tor-Dienst-Neustarts sind in Ordnung." #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -826,11 +829,16 @@ msgid "" " insecure. Relays that attempt to downgrade to an insecure version will be " "rejected from the network automatically." msgstr "" +"Aus Sicherheitsgründen sollten die Tor-Relays ihre Tor-Version nicht von " +"einer unterstützten auf eine nicht unterstützte Version von Tor herabstufen." +" Einige nicht unterstützte Versionen sind unsicher. Relays, die versuchen, " +"ein Downgrade auf eine unsichere Version durchzuführen, werden automatisch " +"vom Netzwerk zurückgewiesen." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.title) msgid "Types of relays on the Tor network" -msgstr "" +msgstr "Arten von Relays im Tor-Netzwerk" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.subtitle) @@ -838,6 +846,9 @@ msgid "" "Bridges, guards, middle relays, and exits all serve important functions in " "the Tor network. Learn about the different relays you can run." msgstr "" +"Brücken, Guards, Mittel-Relays und Exits erfüllen alle wichtige Funktionen " +"im Tor-Netzwerk. Erfahre mehr über die verschiedenen Relays, die du " +"betreiben kannst." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -845,6 +856,8 @@ msgid "" "All nodes are important, but they have different technical requirements and " "legal implications." msgstr "" +"Alle Knoten sind wichtig, aber sie haben unterschiedliche technische " +"Anforderungen und rechtliche Auswirkungen." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -852,16 +865,18 @@ msgid "" "Understanding the different kinds of nodes is the first step to learning " "which one is right for you." msgstr "" +"Das Verstehen der verschiedenen Arten von Knoten ist der erste Schritt, um " +"zu erfahren, welcher der richtige für dich ist." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "# Guard and middle relay" -msgstr "" +msgstr "# Guard und Mittel-Relay" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "(also known as non-exit relays)" -msgstr "" +msgstr "(auch bekannt als Non-Exit-Relay)" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -869,6 +884,8 @@ msgid "" "A guard relay is the first relay in the chain of 3 relays building a Tor " "circuit." msgstr "" +"Ein Schutz-Relay ist das erste Relay in der Kette von 3 Relays, die einen " +"Tor-Kanal bilden." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -876,6 +893,8 @@ msgid "" "A middle relay is neither a guard nor an exit, but acts as the second hop " "between the two." msgstr "" +"Ein Mittel-Relay ist weder ein Schutz noch ein Ausgang, sondern fungiert als" +" zweiter Sprung zwischen den beiden." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -883,11 +902,15 @@ msgid "" "To become a guard, a relay has to be stable and fast (at least 2MByte/s) " "otherwise it will remain a middle relay." msgstr "" +"Um ein Schutz zu werden, muss ein Relay stabil und schnell sein (mindestens " +"2MByte/s), sonst bleibt es ein Mittel-Relay." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "Guard and middle relays usually do not receive abuse complaints." msgstr "" +"Schutz- und Mittel-Relays erhalten in der Regel keine " +"Missbrauchsbeschwerden." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -896,6 +919,10 @@ msgid "" "blocked by certain services that don't understand how Tor works or " "deliberately want to censor Tor users." msgstr "" +"Alle Relays werden in der öffentlichen Liste der Tor-Relays aufgelistet, so " +"dass sie von bestimmten Diensten blockiert werden können, die nicht " +"verstehen, wie Tor funktioniert oder absichtlich Tor-Benutzer zensieren " +"wollen." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -904,6 +931,10 @@ msgid "" " consider running a bridge instead so that your non-Tor traffic doesn't get " "blocked as though it's coming from Tor." msgstr "" +"Wenn du ein Relay von zu Hause aus betreibst und eine statische IP hast, " +"solltest du vielleicht in Betracht ziehen, stattdessen eine Brücke zu " +"betreiben, damit dein Nicht-Tor-Verkehr nicht blockiert wird, als käme er " +"von Tor." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -911,6 +942,8 @@ msgid "" "If you have a dynamic IP address or multiple static IPs, this isn't as much " "of an issue." msgstr "" +"Wenn du eine dynamische IP-Adresse oder mehrere statische IPs hast, ist das " +"kein so großes Problem." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 05 Feb '20

05 Feb '20

commit e9a0d077c246bcff2f3dde6d442dfddfa6c9139f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 4 20:45:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+de.po | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contents+de.po b/contents+de.po index af04af00e2..fdce591360 100644 --- a/contents+de.po +++ b/contents+de.po @@ -778,6 +778,9 @@ msgid "" "performance and allow for up to about ~400-450 Mbps in each direction on a " "single tor instance on modern CPUs)." msgstr "" +"* Es wird empfohlen, CPUs mit AESNI-Unterstützung zu verwenden (das " +"verbessert die Leistung und ermöglicht bis zu ~400-450 Mbps in jeder " +"Richtung auf einer einzelnen Tor-Instanz auf modernen CPUs)." #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -785,6 +788,8 @@ msgid "" "If the file /proc/cpuinfo contains the word aes your CPU has support for " "AES-NI." msgstr "" +"Wenn die Datei /proc/cpuinfo das Wort aes enthält, hat deine CPU " +"Unterstützung für AES-NI." #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)

1 0

[bridgedb/master] update link
by phw＠torproject.org 05 Feb '20

05 Feb '20

commit ff257162309ba9f92fca473109371ceec1f64917 Author: emma peel <emma.peel(a)riseup.net> Date: Fri Oct 4 10:14:26 2019 +0200 update link --- bridgedb/distributors/https/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/distributors/https/templates/base.html b/bridgedb/distributors/https/templates/base.html index 00997b2..9372505 100644 --- a/bridgedb/distributors/https/templates/base.html +++ b/bridgedb/distributors/https/templates/base.html @@ -65,7 +65,7 @@ ${next.body(strings, langs, rtl=rtl, lang=lang, langOverride=langOverride, **kwa <h4>${_(strings.FAQ[0])}</h4> <p> ${_(strings.FAQ[1]) % \ - ("""<a href="https://www.torproject.org/docs/bridges">""", "</a>")} + ("""<a href="https://tb-manual.torproject.org/bridges/">""", "</a>")} </p> <h4>${_(strings.OTHER_DISTRIBUTORS[0])}</h4>

1 0

[bridgedb/master] Add Cecylia as core maintainer.
by phw＠torproject.org 05 Feb '20

05 Feb '20

commit da46bab3ecfedb5d020a2acc3cba30286e9ced89 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Jan 28 09:38:07 2020 -0800 Add Cecylia as core maintainer. --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index df60ed3..d492629 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,6 @@ Current core developers: Philipp Winter <phw(a)torproject.org> + Cecylia Bocovich <cohosh(a)torproject.org> Past core developers: Matthew Finkel <sysrqb(a)torproject.org> 0x017DD169EA793BE2

1 0

[bridgedb/master] Merge branch 'release-0.9.1' into develop
by phw＠torproject.org 05 Feb '20

05 Feb '20

commit 8bf0fb21311392823fa0dab0946fc48b58cc5a79 Merge: 049a9d9 5a4c972 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Oct 29 09:26:23 2019 -0700 Merge branch 'release-0.9.1' into develop CHANGELOG | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

1 0

[bridgedb/master] Remove isis as default trac owner and cc contact.
by phw＠torproject.org 05 Feb '20

05 Feb '20

commit 045e34b829feef47426d65ae49c6a55247c9bc4d Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Jan 28 09:46:23 2020 -0800 Remove isis as default trac owner and cc contact. Isis hasn't been maintaining BridgeDB in quite a while. By omitting the owner and CC field, we're leaving it up to trac to pick its defaults. --- bridgedb/distributors/https/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/distributors/https/templates/base.html b/bridgedb/distributors/https/templates/base.html index 9372505..fb54e81 100644 --- a/bridgedb/distributors/https/templates/base.html +++ b/bridgedb/distributors/https/templates/base.html @@ -88,7 +88,7 @@ ${next.body(strings, langs, rtl=rtl, lang=lang, langOverride=langOverride, **kwa <div class="footer footer-small"> <hr> <p> - <a href="https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…"> + <a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention/…"> <i class="icon icon-large icon-bug"><span id="footer-bugs"> ${_("Report a Bug")}</span></i></a>   ·   <a href="https://gitweb.torproject.org/bridgedb.git">

1 0