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

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:

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

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 ++--

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

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

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

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

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

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.

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

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

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

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

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

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

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

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

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

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

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

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

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

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;.

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

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

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

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

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

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

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

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

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

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

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

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

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

commit 8dfabbe36d5f90e2df14b504461298b1585fd5ae Author: iwakeh Date: Wed Dec 20 16:16:03 2017 + Return results in deterministic order. Part of task-25002. --- CHANGELOG.md | 5 +

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

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

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

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] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

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] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.9

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

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

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

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

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

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

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

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

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] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

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

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

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

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

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

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

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

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

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

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

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] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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 |

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

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

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

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

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

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 |

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

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] [tor/maint-0.3.3] Merge branch 'bug25474_032' into maint-0.3.2

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

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

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 |

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

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

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

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(+),

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

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 |

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

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(+),

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

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

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

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

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

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(+),

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

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

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

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 |

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

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

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

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(-)

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

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

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

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(-)

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

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

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

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(-)

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

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

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

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] [tor/release-0.3.3] Update the documentation in tor_api.h

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

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

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

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

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

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

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(-)

  1   2   >