[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2018-04-05 Thread translation
commit 273233dba9d7bcf6024d4ca7e1e832c5891bf097 Author: Translation commit bot Date: Thu Apr 5 23:45:49 2018 + Update translations for tails-persistence-setup --- ti/ti.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ti/ti.po

[tor-commits] [tor/master] fix confusing comment

2018-04-05 Thread arma
commit 0b0e4886cfd78687f8ba80da1988524bb15aa17c Author: Roger Dingledine Date: Thu Apr 5 15:59:37 2018 -0400 fix confusing comment presumably introduced by copy-and-paste mistake --- src/or/entrynodes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [nyx/master] Link to openports.se for OpenBSD

2018-04-05 Thread atagar
commit ef24087473dbbda59a6d227b08861af5b708c410 Author: Damian Johnson Date: Thu Apr 5 12:38:16 2018 -0700 Link to openports.se for OpenBSD Seems like a nicer landing page to link to. It directs folks to CSVweb if they want it. --- web/index.html | 4

[tor-commits] [onionoo/master] Fetch descriptors from both CollecTor instances.

2018-04-05 Thread karsten
commit 520c1577c119f46f5de8db83ee9d4eb498a30e7a Author: Karsten Loesing Date: Tue Apr 3 15:19:36 2018 +0200 Fetch descriptors from both CollecTor instances. Fixes #25700. --- CHANGELOG.md | 1 +

[tor-commits] [tor/master] Document a requirement for cells to be encrypted.

2018-04-05 Thread nickm
commit a9fa483004b0951c3fc7f8a9f5a097b917da6fa8 Author: Nick Mathewson Date: Sat Mar 24 13:49:44 2018 -0400 Document a requirement for cells to be encrypted. --- src/or/relay_crypto.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/or/relay_crypto.c

[tor-commits] [tor/master] Extract the crypto parts of circuit_package_relay_cell.

2018-04-05 Thread nickm
commit 320dcf65b7c8e382b27260a037bd1e93e563ccb9 Author: Nick Mathewson Date: Sat Mar 17 10:14:35 2018 -0400 Extract the crypto parts of circuit_package_relay_cell. --- src/or/relay.c | 57 ++-- src/or/relay.h |

[tor-commits] [tor/master] Rename 'relay_crypt' to 'relay_decrypt_cell'

2018-04-05 Thread nickm
commit 298932605495dc9ef3e8e068c36a80a517036195 Author: Nick Mathewson Date: Sat Mar 17 10:03:53 2018 -0400 Rename 'relay_crypt' to 'relay_decrypt_cell' This function is used upon receiving a cell, and only handles the decrypting part. The encryption

[tor-commits] [tor/master] Merge remote-tracking branch 'public/split_relay_crypto'

2018-04-05 Thread nickm
commit c6d7e0becf33409f87c41c369cd3b561f477df2b Merge: 2933f73b3 a9fa48300 Author: Nick Mathewson Date: Thu Apr 5 12:12:18 2018 -0400 Merge remote-tracking branch 'public/split_relay_crypto' src/or/circuitbuild.c | 77 +-- src/or/circuitlist.c |

[tor-commits] [tor/master] Move relay-crypto functions from relay.[ch] to relay_crypto.[ch]

2018-04-05 Thread nickm
commit 80955be6ecae7095d267981b39d10237aabc38a6 Author: Nick Mathewson Date: Sat Mar 17 10:21:57 2018 -0400 Move relay-crypto functions from relay.[ch] to relay_crypto.[ch] This should help us improve modularity, and should also make it easier for people

[tor-commits] [tor/master] Basic unit tests for relay_crypto.c

2018-04-05 Thread nickm
commit 7db4d0c55f1e0146ecd0207f788075b672411cc2 Author: Nick Mathewson Date: Sat Mar 17 11:23:05 2018 -0400 Basic unit tests for relay_crypto.c These tests handle incoming and outgoing cells on a three-hop circuit, and make sure that the crypto works

[tor-commits] [tor/master] Extract the cryptographic parts of crypt_path_t and or_circuit_t.

2018-04-05 Thread nickm
commit 5ecad6c95d5e8e9a0abe5c86b5f8f066cc7a8f1c Author: Nick Mathewson Date: Sat Mar 17 10:59:15 2018 -0400 Extract the cryptographic parts of crypt_path_t and or_circuit_t. Additionally, this change extracts the functions that created and freed these

[tor-commits] [tor/release-0.3.2] PerConnBW{Rate, Burst} docs: do not say consensus param is always set

2018-04-05 Thread nickm
commit c2d93e8a7d1d2d4e7f3516681e2ee62ce4f87285 Author: Nick Mathewson Date: Mon Mar 19 06:14:57 2018 -0400 PerConnBW{Rate,Burst} docs: do not say consensus param is always set Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage entries were

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

2018-04-05 Thread nickm
commit 124e06e85cf72152e9bdbd91e3cd6da9a5b1fd39 Merge: df519e5de c2d93e8a7 Author: Nick Mathewson Date: Thu Apr 5 12:08:53 2018 -0400 Merge branch 'ticket25296_032_squashed' into maint-0.3.2 changes/bug25296_032 | 5 + doc/tor.1.txt| 12 ++-- 2

[tor-commits] [tor/maint-0.3.3] PerConnBW{Rate, Burst} docs: do not say consensus param is always set

2018-04-05 Thread nickm
commit c2d93e8a7d1d2d4e7f3516681e2ee62ce4f87285 Author: Nick Mathewson Date: Mon Mar 19 06:14:57 2018 -0400 PerConnBW{Rate,Burst} docs: do not say consensus param is always set Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage entries were

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

2018-04-05 Thread nickm
commit 98a04984901585ed1a31032cc58d6dc3bd5dd415 Merge: ad0bc6e54 12fc4206f Author: Nick Mathewson Date: Thu Apr 5 12:09:00 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25296_032 | 5 + doc/tor.1.txt| 12 ++-- 2 files

[tor-commits] [tor/release-0.3.3] PerConnBW{Rate, Burst} docs: do not say consensus param is always set

2018-04-05 Thread nickm
commit c2d93e8a7d1d2d4e7f3516681e2ee62ce4f87285 Author: Nick Mathewson Date: Mon Mar 19 06:14:57 2018 -0400 PerConnBW{Rate,Burst} docs: do not say consensus param is always set Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage entries were

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

2018-04-05 Thread nickm
commit 124e06e85cf72152e9bdbd91e3cd6da9a5b1fd39 Merge: df519e5de c2d93e8a7 Author: Nick Mathewson Date: Thu Apr 5 12:08:53 2018 -0400 Merge branch 'ticket25296_032_squashed' into maint-0.3.2 changes/bug25296_032 | 5 + doc/tor.1.txt| 12 ++-- 2

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

2018-04-05 Thread nickm
commit 12fc4206f28576d872033b8a99756252e5354662 Merge: 2dee38fba 124e06e85 Author: Nick Mathewson Date: Thu Apr 5 12:09:00 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25296_032 | 5 + doc/tor.1.txt| 12 ++-- 2 files

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

2018-04-05 Thread nickm
commit bc250fcabd4cb5695a0c3725e24eb6a30e54c238 Merge: 955a7f52d 124e06e85 Author: Nick Mathewson Date: Thu Apr 5 12:09:00 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25296_032 | 5 + doc/tor.1.txt| 12 ++-- 2 files

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

2018-04-05 Thread nickm
commit 124e06e85cf72152e9bdbd91e3cd6da9a5b1fd39 Merge: df519e5de c2d93e8a7 Author: Nick Mathewson Date: Thu Apr 5 12:08:53 2018 -0400 Merge branch 'ticket25296_032_squashed' into maint-0.3.2 changes/bug25296_032 | 5 + doc/tor.1.txt| 12 ++-- 2

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

2018-04-05 Thread nickm
commit 12fc4206f28576d872033b8a99756252e5354662 Merge: 2dee38fba 124e06e85 Author: Nick Mathewson Date: Thu Apr 5 12:09:00 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25296_032 | 5 + doc/tor.1.txt| 12 ++-- 2 files

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

2018-04-05 Thread nickm
commit 2933f73b31a51ed4ffdb5c0f69c7b58d11c237b6 Merge: 6bd8f648b 12fc4206f Author: Nick Mathewson Date: Thu Apr 5 12:09:00 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25296_032 | 5 + doc/tor.1.txt| 12 ++-- 2 files changed, 11

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

2018-04-05 Thread nickm
commit 12fc4206f28576d872033b8a99756252e5354662 Merge: 2dee38fba 124e06e85 Author: Nick Mathewson Date: Thu Apr 5 12:09:00 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25296_032 | 5 + doc/tor.1.txt| 12 ++-- 2 files

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

2018-04-05 Thread nickm
commit 124e06e85cf72152e9bdbd91e3cd6da9a5b1fd39 Merge: df519e5de c2d93e8a7 Author: Nick Mathewson Date: Thu Apr 5 12:08:53 2018 -0400 Merge branch 'ticket25296_032_squashed' into maint-0.3.2 changes/bug25296_032 | 5 + doc/tor.1.txt| 12 ++-- 2

[tor-commits] [tor/master] PerConnBW{Rate, Burst} docs: do not say consensus param is always set

2018-04-05 Thread nickm
commit c2d93e8a7d1d2d4e7f3516681e2ee62ce4f87285 Author: Nick Mathewson Date: Mon Mar 19 06:14:57 2018 -0400 PerConnBW{Rate,Burst} docs: do not say consensus param is always set Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage entries were

[tor-commits] [tor/maint-0.3.2] PerConnBW{Rate, Burst} docs: do not say consensus param is always set

2018-04-05 Thread nickm
commit c2d93e8a7d1d2d4e7f3516681e2ee62ce4f87285 Author: Nick Mathewson Date: Mon Mar 19 06:14:57 2018 -0400 PerConnBW{Rate,Burst} docs: do not say consensus param is always set Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage entries were

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

2018-04-05 Thread nickm
commit 124e06e85cf72152e9bdbd91e3cd6da9a5b1fd39 Merge: df519e5de c2d93e8a7 Author: Nick Mathewson Date: Thu Apr 5 12:08:53 2018 -0400 Merge branch 'ticket25296_032_squashed' into maint-0.3.2 changes/bug25296_032 | 5 + doc/tor.1.txt| 12 ++-- 2

[tor-commits] [tor/master] man: Move RephistTrackTime to the server section

2018-04-05 Thread nickm
commit 6bd8f648b71b5f1090e41a51490fcbda6d2351ce Author: David Goulet Date: Thu Apr 5 09:42:45 2018 -0400 man: Move RephistTrackTime to the server section Every node in the network uses that value, it is a general server options, not a dirauth specific

[tor-commits] [tor/master] Switch to use should_record_bridge_info()

2018-04-05 Thread dgoulet
commit f5f9c2554601e51157d8b563f124cea3fd3d98d4 Author: Neel Chauhan Date: Thu Apr 5 08:35:21 2018 -0400 Switch to use should_record_bridge_info() Both in geoip_note_client_seen() and options_need_geoip_info(), switch from accessing the options directly to

[tor-commits] [torbutton/master] Bug 25126: Make about:tor layout responsive

2018-04-05 Thread gk
commit fb8c46b3fb3e89b0fd182f87ba3139f5b31ad186 Author: Igor Oliveira Date: Tue Apr 3 20:15:38 2018 -0300 Bug 25126: Make about:tor layout responsive Use flexbox and media queries to make the layout responsive. For small and medium break points,

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

2018-04-05 Thread nickm
commit 2dee38fba0193c952500b9d0227ebcff6d5432d6 Merge: 78bf56416 df519e5de Author: Nick Mathewson Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6

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

2018-04-05 Thread nickm
commit ad0bc6e54c906e3c9e44a25d7675954b88775535 Merge: 876b4b168 2dee38fba Author: Nick Mathewson Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6

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

2018-04-05 Thread nickm
commit df519e5de87d027ba51742b2b50710c69b9db2be Merge: 9b10eb2d7 e813116d3 Author: Nick Mathewson Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6

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

2018-04-05 Thread nickm
commit df519e5de87d027ba51742b2b50710c69b9db2be Merge: 9b10eb2d7 e813116d3 Author: Nick Mathewson Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6

[tor-commits] [tor/maint-0.3.1] Switch Travis to stable rust

2018-04-05 Thread nickm
commit e813116d3d630d81feb97f39dd65fdf245eecebc Author: Taylor Yu Date: Wed Apr 4 17:07:39 2018 -0500 Switch Travis to stable rust --- .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6 insertions(+), 2 deletions(-) diff --git

[tor-commits] [tor/release-0.3.1] Switch Travis to stable rust

2018-04-05 Thread nickm
commit e813116d3d630d81feb97f39dd65fdf245eecebc Author: Taylor Yu Date: Wed Apr 4 17:07:39 2018 -0500 Switch Travis to stable rust --- .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6 insertions(+), 2 deletions(-) diff --git

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

2018-04-05 Thread nickm
commit 2dee38fba0193c952500b9d0227ebcff6d5432d6 Merge: 78bf56416 df519e5de Author: Nick Mathewson Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6

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

2018-04-05 Thread nickm
commit 347b38d6d9dc73f0d14ff60ee8729550cea9a952 Merge: 04007557f e813116d3 Author: Nick Mathewson Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6

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

2018-04-05 Thread nickm
commit 98157c72cd9ddcfd92cd5cd2749d19d1677efd14 Merge: ad8347418 2dee38fba Author: Nick Mathewson Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.3' .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6 insertions(+), 2

[tor-commits] [tor/maint-0.3.3] Switch Travis to stable rust

2018-04-05 Thread nickm
commit e813116d3d630d81feb97f39dd65fdf245eecebc Author: Taylor Yu Date: Wed Apr 4 17:07:39 2018 -0500 Switch Travis to stable rust --- .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6 insertions(+), 2 deletions(-) diff --git

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

2018-04-05 Thread nickm
commit df519e5de87d027ba51742b2b50710c69b9db2be Merge: 9b10eb2d7 e813116d3 Author: Nick Mathewson Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6

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

2018-04-05 Thread nickm
commit df519e5de87d027ba51742b2b50710c69b9db2be Merge: 9b10eb2d7 e813116d3 Author: Nick Mathewson Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6

[tor-commits] [tor/master] Switch Travis to stable rust

2018-04-05 Thread nickm
commit e813116d3d630d81feb97f39dd65fdf245eecebc Author: Taylor Yu Date: Wed Apr 4 17:07:39 2018 -0500 Switch Travis to stable rust --- .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6 insertions(+), 2 deletions(-) diff --git

[tor-commits] [tor/release-0.3.3] Switch Travis to stable rust

2018-04-05 Thread nickm
commit e813116d3d630d81feb97f39dd65fdf245eecebc Author: Taylor Yu Date: Wed Apr 4 17:07:39 2018 -0500 Switch Travis to stable rust --- .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6 insertions(+), 2 deletions(-) diff --git

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

2018-04-05 Thread nickm
commit 2dee38fba0193c952500b9d0227ebcff6d5432d6 Merge: 78bf56416 df519e5de Author: Nick Mathewson Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6

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

2018-04-05 Thread nickm
commit df519e5de87d027ba51742b2b50710c69b9db2be Merge: 9b10eb2d7 e813116d3 Author: Nick Mathewson Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6

[tor-commits] [tor/release-0.3.2] Switch Travis to stable rust

2018-04-05 Thread nickm
commit e813116d3d630d81feb97f39dd65fdf245eecebc Author: Taylor Yu Date: Wed Apr 4 17:07:39 2018 -0500 Switch Travis to stable rust --- .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6 insertions(+), 2 deletions(-) diff --git

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

2018-04-05 Thread nickm
commit 955a7f52d36e99a96df5e54a2a88dcc2b9931f62 Merge: 70bd4aae6 df519e5de Author: Nick Mathewson Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6

[tor-commits] [tor/maint-0.3.2] Switch Travis to stable rust

2018-04-05 Thread nickm
commit e813116d3d630d81feb97f39dd65fdf245eecebc Author: Taylor Yu Date: Wed Apr 4 17:07:39 2018 -0500 Switch Travis to stable rust --- .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6 insertions(+), 2 deletions(-) diff --git

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

2018-04-05 Thread nickm
commit 78bf56416868ed6de53af63d49c6d8555150f856 Merge: ac3e389db 9b10eb2d7 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 04007557fb5473ad4571afe78207c114ecfaf1f0 Merge: cbea95ae6 834eef245 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit b68e636b3368feb48444fd2f652ca279ddb73946 Merge: 4bb7d9fd1 1fa396b0a Author: Nick Mathewson Date: Thu Apr 5 08:22:33 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 834eef2452a667c5557e5a09bb879cc2fc98a661 Merge: 5acfc3087 b68e636b3 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit b68e636b3368feb48444fd2f652ca279ddb73946 Merge: 4bb7d9fd1 1fa396b0a Author: Nick Mathewson Date: Thu Apr 5 08:22:33 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 8a363a7c8467093061d02fe611d18a971f0c1078 Merge: c26fa0537 b68e636b3 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 876b4b168ac9552de392d9c8275754f560d5bb32 Merge: 8a8b4ae69 78bf56416 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit b68e636b3368feb48444fd2f652ca279ddb73946 Merge: 4bb7d9fd1 1fa396b0a Author: Nick Mathewson Date: Thu Apr 5 08:22:33 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 834eef2452a667c5557e5a09bb879cc2fc98a661 Merge: 5acfc3087 b68e636b3 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 9b10eb2d7abe703f544aca559d385fc7f269 Merge: 0b795ce6d 834eef245 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit b68e636b3368feb48444fd2f652ca279ddb73946 Merge: 4bb7d9fd1 1fa396b0a Author: Nick Mathewson Date: Thu Apr 5 08:22:33 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 9b10eb2d7abe703f544aca559d385fc7f269 Merge: 0b795ce6d 834eef245 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 70bd4aae670bf48af0b83a3b14b2d841244b7e92 Merge: 6170f87e0 9b10eb2d7 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 834eef2452a667c5557e5a09bb879cc2fc98a661 Merge: 5acfc3087 b68e636b3 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 78bf56416868ed6de53af63d49c6d8555150f856 Merge: ac3e389db 9b10eb2d7 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 834eef2452a667c5557e5a09bb879cc2fc98a661 Merge: 5acfc3087 b68e636b3 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 78bf56416868ed6de53af63d49c6d8555150f856 Merge: ac3e389db 9b10eb2d7 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 9b10eb2d7abe703f544aca559d385fc7f269 Merge: 0b795ce6d 834eef245 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit b68e636b3368feb48444fd2f652ca279ddb73946 Merge: 4bb7d9fd1 1fa396b0a Author: Nick Mathewson Date: Thu Apr 5 08:22:33 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit b68e636b3368feb48444fd2f652ca279ddb73946 Merge: 4bb7d9fd1 1fa396b0a Author: Nick Mathewson Date: Thu Apr 5 08:22:33 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit ad8347418f9cbf629de4213eb0a3681033df7b1b Merge: 43f315558 78bf56416 Author: Nick Mathewson Date: Thu Apr 5 08:22:35 2018 -0400 Merge branch 'maint-0.3.3' changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 9b10eb2d7abe703f544aca559d385fc7f269 Merge: 0b795ce6d 834eef245 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit b68e636b3368feb48444fd2f652ca279ddb73946 Merge: 4bb7d9fd1 1fa396b0a Author: Nick Mathewson Date: Thu Apr 5 08:22:33 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 834eef2452a667c5557e5a09bb879cc2fc98a661 Merge: 5acfc3087 b68e636b3 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 279fa65d34bbb41d1428eb62f6172b218598644e Merge: 1d281eb93 1fa396b0a Author: Nick Mathewson Date: Thu Apr 5 08:22:33 2018 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 9b10eb2d7abe703f544aca559d385fc7f269 Merge: 0b795ce6d 834eef245 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit b68e636b3368feb48444fd2f652ca279ddb73946 Merge: 4bb7d9fd1 1fa396b0a Author: Nick Mathewson Date: Thu Apr 5 08:22:33 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 834eef2452a667c5557e5a09bb879cc2fc98a661 Merge: 5acfc3087 b68e636b3 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit b68e636b3368feb48444fd2f652ca279ddb73946 Merge: 4bb7d9fd1 1fa396b0a Author: Nick Mathewson Date: Thu Apr 5 08:22:33 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 834eef2452a667c5557e5a09bb879cc2fc98a661 Merge: 5acfc3087 b68e636b3 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

2018-04-05 Thread nickm
commit 8f798b686d0d699c55a20ef19fe57dd487b3aa69 Merge: ec8ee5412 e3ad4957a Author: Nick Mathewson Date: Thu Apr 5 08:20:15 2018 -0400 Merge branch 'bug25679_033_squashed' into maint-0.3.3 changes/bug25679 | 4 configure.ac | 12 ++-- 2 files

[tor-commits] [tor/master] Fix the default for TOR_RUST_DEPENDENCIES

2018-04-05 Thread nickm
commit e3ad4957a8d06716d3e5dad9cda09ce236b941d1 Author: Nick Mathewson Date: Fri Mar 30 08:53:58 2018 -0400 Fix the default for TOR_RUST_DEPENDENCIES By default, we want to look at the crates directory of the submodule, not the toplevel of the submodule.

[tor-commits] [tor/maint-0.3.3] man: Add a comment to anchor only option

2018-04-05 Thread nickm
commit ff38c0589ceab60cda9c27b117d1dcfef55b3539 Author: David Goulet Date: Wed Apr 4 11:38:42 2018 -0400 man: Add a comment to anchor only option Some anchor don't appear in the final man page so document those so we understand why we do that in the

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3

2018-04-05 Thread nickm
commit ac3e389dbd7224a23dfa12da7a15b748feb88435 Merge: 8f798b686 ff38c0589 Author: Nick Mathewson Date: Thu Apr 5 08:21:38 2018 -0400 Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3 changes/bug25582 | 3 +++ doc/tor.1.txt| 6 +- 2 files

[tor-commits] [tor/release-0.3.3] man: Add a comment to anchor only option

2018-04-05 Thread nickm
commit ff38c0589ceab60cda9c27b117d1dcfef55b3539 Author: David Goulet Date: Wed Apr 4 11:38:42 2018 -0400 man: Add a comment to anchor only option Some anchor don't appear in the final man page so document those so we understand why we do that in the

[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3

2018-04-05 Thread nickm
commit ac3e389dbd7224a23dfa12da7a15b748feb88435 Merge: 8f798b686 ff38c0589 Author: Nick Mathewson Date: Thu Apr 5 08:21:38 2018 -0400 Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3 changes/bug25582 | 3 +++ doc/tor.1.txt| 6 +- 2 files

[tor-commits] [tor/release-0.3.3] Remove erroneous section heading "ExitPolicyDefault"

2018-04-05 Thread nickm
commit 6d7c4c6ec2f76512c1142c1cb4453967d3bc1661 Author: Nick Mathewson Date: Thu Mar 29 15:06:07 2018 -0400 Remove erroneous section heading "ExitPolicyDefault" The anchor here was originally introduced to make sure that the manpage would format

[tor-commits] [tor/master] man: Add a comment to anchor only option

2018-04-05 Thread nickm
commit ff38c0589ceab60cda9c27b117d1dcfef55b3539 Author: David Goulet Date: Wed Apr 4 11:38:42 2018 -0400 man: Add a comment to anchor only option Some anchor don't appear in the final man page so document those so we understand why we do that in the

[tor-commits] [tor/maint-0.3.3] Remove erroneous section heading "ExitPolicyDefault"

2018-04-05 Thread nickm
commit 6d7c4c6ec2f76512c1142c1cb4453967d3bc1661 Author: Nick Mathewson Date: Thu Mar 29 15:06:07 2018 -0400 Remove erroneous section heading "ExitPolicyDefault" The anchor here was originally introduced to make sure that the manpage would format

[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3

2018-04-05 Thread nickm
commit ac3e389dbd7224a23dfa12da7a15b748feb88435 Merge: 8f798b686 ff38c0589 Author: Nick Mathewson Date: Thu Apr 5 08:21:38 2018 -0400 Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3 changes/bug25582 | 3 +++ doc/tor.1.txt| 6 +- 2 files

[tor-commits] [tor/release-0.3.3] Fix the default for TOR_RUST_DEPENDENCIES

2018-04-05 Thread nickm
commit e3ad4957a8d06716d3e5dad9cda09ce236b941d1 Author: Nick Mathewson Date: Fri Mar 30 08:53:58 2018 -0400 Fix the default for TOR_RUST_DEPENDENCIES By default, we want to look at the crates directory of the submodule, not the toplevel of the submodule.

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

2018-04-05 Thread nickm
commit 43f31555827319077858fb3872c28764961b944a Merge: 52846f728 ac3e389db Author: Nick Mathewson Date: Thu Apr 5 08:21:43 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25582 | 3 +++ changes/bug25679 | 4 configure.ac | 12 ++-- doc/tor.1.txt

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

2018-04-05 Thread nickm
commit 8a8b4ae69b4f8a28afcc245f98c11b34165ddaaf Merge: 01037c106 ac3e389db Author: Nick Mathewson Date: Thu Apr 5 08:21:43 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25582 | 3 +++ changes/bug25679 | 4 configure.ac | 12

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

2018-04-05 Thread nickm
commit 8f798b686d0d699c55a20ef19fe57dd487b3aa69 Merge: ec8ee5412 e3ad4957a Author: Nick Mathewson Date: Thu Apr 5 08:20:15 2018 -0400 Merge branch 'bug25679_033_squashed' into maint-0.3.3 changes/bug25679 | 4 configure.ac | 12 ++-- 2 files

[tor-commits] [tor/master] Remove erroneous section heading "ExitPolicyDefault"

2018-04-05 Thread nickm
commit 6d7c4c6ec2f76512c1142c1cb4453967d3bc1661 Author: Nick Mathewson Date: Thu Mar 29 15:06:07 2018 -0400 Remove erroneous section heading "ExitPolicyDefault" The anchor here was originally introduced to make sure that the manpage would format

[tor-commits] [tor/maint-0.3.3] Fix the default for TOR_RUST_DEPENDENCIES

2018-04-05 Thread nickm
commit e3ad4957a8d06716d3e5dad9cda09ce236b941d1 Author: Nick Mathewson Date: Fri Mar 30 08:53:58 2018 -0400 Fix the default for TOR_RUST_DEPENDENCIES By default, we want to look at the crates directory of the submodule, not the toplevel of the submodule.

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

2018-04-05 Thread nickm
commit 8f798b686d0d699c55a20ef19fe57dd487b3aa69 Merge: ec8ee5412 e3ad4957a Author: Nick Mathewson Date: Thu Apr 5 08:20:15 2018 -0400 Merge branch 'bug25679_033_squashed' into maint-0.3.3 changes/bug25679 | 4 configure.ac | 12 ++-- 2 files

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

2018-04-05 Thread translation
commit c906c15b856f72ac3b515fb0f07a920a9a80d865 Author: Translation commit bot Date: Thu Apr 5 10:15:32 2018 + Update translations for https_everywhere --- it/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

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

2018-04-05 Thread translation
commit 3da884cb29645d2e2e1c06137b851c6321da9dbc Author: Translation commit bot Date: Thu Apr 5 10:15:41 2018 + Update translations for https_everywhere_completed --- it/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git

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

2018-04-05 Thread translation
commit b46cb7ecd2ef1b89bb1aed622bbe7ee85bd27d4b Author: Translation commit bot Date: Thu Apr 5 07:17:36 2018 + Update translations for tails-perl5lib_completed --- es.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es.po

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

2018-04-05 Thread translation
commit c4d50790b67ba59197cdb1f73da9bae577be68ae Author: Translation commit bot Date: Thu Apr 5 07:17:32 2018 + Update translations for tails-perl5lib --- es.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es.po b/es.po index

  1   2   >