[tor-commits] [metrics-web/master] Properly skip previously imported webstats files.

2019-01-07 Thread karsten
commit 9bdb6d39fc7b0ac8e7327caeafabfac43a41689f Author: Karsten Loesing Date: Mon Jan 7 11:59:19 2019 +0100 Properly skip previously imported webstats files. Turns out we never skipped previously imported webstats files due to two bugs: 1. While building a list of

[tor-commits] [metrics-web/master] Update news.json to version 307 of doc/MetricsTimeline.

2019-01-07 Thread karsten
commit f6f0570819a8a2e05c3e22636b21e00629d50b8f Author: Karsten Loesing Date: Mon Jan 7 12:27:51 2019 +0100 Update news.json to version 307 of doc/MetricsTimeline. --- src/main/resources/web/json/news.json | 202 +- 1 file changed, 173 insertions(+), 29

[tor-commits] [metrics-web/master] Stop calling censorship detector BETA.

2019-01-07 Thread karsten
commit 8c24f8e174c277e1c25222bbd598bb2278289e00 Author: Karsten Loesing Date: Mon Jan 7 12:20:35 2019 +0100 Stop calling censorship detector BETA. --- src/main/resources/web/jsps/graph.jsp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-01-07 Thread translation
commit 8214d4793e5cd51d98958f119578528d64e20128 Author: Translation commit bot Date: Mon Jan 7 15:15:26 2019 + Update translations for donatepages-messagespot --- locale/ru/LC_MESSAGES/messages.po | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git

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

2019-01-07 Thread nickm
commit d199519706e13370597a158130ffe5e3a5ddea72 Merge: 0402746a9 52b508735 Author: Nick Mathewson Date: Mon Jan 7 10:23:30 2019 -0500 Merge branch 'maint-0.3.5' "ours" to avoid version bump. ___ tor-commits mailing list

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

2019-01-07 Thread nickm
commit d8196dc200b9a21af53313999551c7c081a5c8f4 Merge: 3d18903f5 63eed6edf Author: Nick Mathewson Date: Mon Jan 7 10:22:13 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid version bump. ___ tor-commits

[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-01-07 Thread nickm
commit d51595ec573df21cc96ee71fbb466d6a4e30ae1c Merge: 85c5f5850 ea47563dd Author: Nick Mathewson Date: Mon Jan 7 10:22:47 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump. ___ tor-commits mailing

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

2019-01-07 Thread nickm
commit d8196dc200b9a21af53313999551c7c081a5c8f4 Merge: 3d18903f5 63eed6edf Author: Nick Mathewson Date: Mon Jan 7 10:22:13 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid version bump. ___ tor-commits

[tor-commits] [tor/master] Bump version to 0.3.5.7

2019-01-07 Thread nickm
commit 52b508735f4e3a58e6d9c808f7815bba66f5190e Author: Nick Mathewson Date: Mon Jan 7 10:23:21 2019 -0500 Bump version to 0.3.5.7 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/maint-0.3.5] Bump to 0.3.4.10

2019-01-07 Thread nickm
commit ea47563dd7da134e8adfa8bff0515ee925318013 Author: Nick Mathewson Date: Mon Jan 7 10:22:42 2019 -0500 Bump to 0.3.4.10 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/release-0.3.5] Bump to 0.3.3.11

2019-01-07 Thread nickm
commit 63eed6edfffe8924a598993d5cb1e95d2d0b470b Author: Nick Mathewson Date: Mon Jan 7 10:21:59 2019 -0500 Bump to 0.3.3.11 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/maint-0.3.5] Bump version to 0.3.5.7

2019-01-07 Thread nickm
commit 52b508735f4e3a58e6d9c808f7815bba66f5190e Author: Nick Mathewson Date: Mon Jan 7 10:23:21 2019 -0500 Bump version to 0.3.5.7 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

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

2019-01-07 Thread nickm
commit d8196dc200b9a21af53313999551c7c081a5c8f4 Merge: 3d18903f5 63eed6edf Author: Nick Mathewson Date: Mon Jan 7 10:22:13 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid version bump. ___ tor-commits

[tor-commits] [tor/master] Bump to 0.3.3.11

2019-01-07 Thread nickm
commit 63eed6edfffe8924a598993d5cb1e95d2d0b470b Author: Nick Mathewson Date: Mon Jan 7 10:21:59 2019 -0500 Bump to 0.3.3.11 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/maint-0.3.5] Bump to 0.3.3.11

2019-01-07 Thread nickm
commit 63eed6edfffe8924a598993d5cb1e95d2d0b470b Author: Nick Mathewson Date: Mon Jan 7 10:21:59 2019 -0500 Bump to 0.3.3.11 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/maint-0.3.3] Bump to 0.3.3.11

2019-01-07 Thread nickm
commit 63eed6edfffe8924a598993d5cb1e95d2d0b470b Author: Nick Mathewson Date: Mon Jan 7 10:21:59 2019 -0500 Bump to 0.3.3.11 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/maint-0.3.4] Bump to 0.3.4.10

2019-01-07 Thread nickm
commit ea47563dd7da134e8adfa8bff0515ee925318013 Author: Nick Mathewson Date: Mon Jan 7 10:22:42 2019 -0500 Bump to 0.3.4.10 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/maint-0.3.4] Bump to 0.3.3.11

2019-01-07 Thread nickm
commit 63eed6edfffe8924a598993d5cb1e95d2d0b470b Author: Nick Mathewson Date: Mon Jan 7 10:21:59 2019 -0500 Bump to 0.3.3.11 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/release-0.3.4] Draft a changelog/releasenotes for 0.3.4.10

2019-01-07 Thread nickm
commit 575e934d02ddb7fd5a221dcbe98428687816a9ab Author: Nick Mathewson Date: Mon Jan 7 10:08:58 2019 -0500 Draft a changelog/releasenotes for 0.3.4.10 --- ChangeLog | 116 ++ 1 file changed, 116 insertions(+) diff --git

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-01-07 Thread translation
commit 4060174862178743ea149f764e8df2f9cc5d2b5c Author: Translation commit bot Date: Mon Jan 7 16:15:24 2019 + Update translations for donatepages-messagespot --- locale/ru/LC_MESSAGES/messages.po | 9 + 1 file changed, 9 insertions(+) diff --git

[tor-commits] [tor/release-0.3.5] Minor spelling tweak.

2019-01-07 Thread nickm
commit 09f83946164160e251f9f992873de1e668b7c74e Author: Nick Mathewson Date: Mon Jan 7 09:22:26 2019 -0500 Minor spelling tweak. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index aa90ade4c..eb91e723a 100644 --- a/ChangeLog +++

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

2019-01-07 Thread nickm
commit d51595ec573df21cc96ee71fbb466d6a4e30ae1c Merge: 85c5f5850 ea47563dd Author: Nick Mathewson Date: Mon Jan 7 10:22:47 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump. ___ tor-commits mailing

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

2019-01-07 Thread nickm
commit d8196dc200b9a21af53313999551c7c081a5c8f4 Merge: 3d18903f5 63eed6edf Author: Nick Mathewson Date: Mon Jan 7 10:22:13 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid version bump. ___ tor-commits

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

2019-01-07 Thread nickm
commit 4f5ea89c117c66def603bc6f4d046e2142a76467 Merge: 248056d9d ea47563dd Author: Nick Mathewson Date: Mon Jan 7 10:23:40 2019 -0500 Merge branch 'maint-0.3.4' into release-0.3.4 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

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

2019-01-07 Thread nickm
commit fb2af84a3fd4723e1357e5061568ddea2703705b Merge: 75dd7f021 52b508735 Author: Nick Mathewson Date: Mon Jan 7 10:23:40 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-01-07 Thread translation
commit d0c03f598226cb58c75e16e197a626f571b035da Author: Translation commit bot Date: Mon Jan 7 15:45:24 2019 + Update translations for donatepages-messagespot --- locale/ru/LC_MESSAGES/messages.po | 26 -- 1 file changed, 24 insertions(+), 2 deletions(-) diff

[tor-commits] [tor/release-0.3.5] Add a paragraph about compatibility, and one about LTS

2019-01-07 Thread nickm
commit 7e9a2232649f130098ba70d6e92927065c25b977 Author: Nick Mathewson Date: Mon Jan 7 09:32:29 2019 -0500 Add a paragraph about compatibility, and one about LTS --- ChangeLog | 14 ++ 1 file changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index

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

2019-01-07 Thread nickm
commit d8196dc200b9a21af53313999551c7c081a5c8f4 Merge: 3d18903f5 63eed6edf Author: Nick Mathewson Date: Mon Jan 7 10:22:13 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid version bump. ___ tor-commits

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

2019-01-07 Thread nickm
commit 8eaa8631794cce7d4a5f0713360cbc3bbaf4b199 Merge: 2d279eaa9 63eed6edf Author: Nick Mathewson Date: Mon Jan 7 10:23:40 2019 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-01-07 Thread nickm
commit d51595ec573df21cc96ee71fbb466d6a4e30ae1c Merge: 85c5f5850 ea47563dd Author: Nick Mathewson Date: Mon Jan 7 10:22:47 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump. ___ tor-commits mailing

[tor-commits] [tor/master] Bump to 0.3.4.10

2019-01-07 Thread nickm
commit ea47563dd7da134e8adfa8bff0515ee925318013 Author: Nick Mathewson Date: Mon Jan 7 10:22:42 2019 -0500 Bump to 0.3.4.10 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/release-0.3.4] Bump to 0.3.3.11

2019-01-07 Thread nickm
commit 63eed6edfffe8924a598993d5cb1e95d2d0b470b Author: Nick Mathewson Date: Mon Jan 7 10:21:59 2019 -0500 Bump to 0.3.3.11 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/release-0.3.3] Bump to 0.3.3.11

2019-01-07 Thread nickm
commit 63eed6edfffe8924a598993d5cb1e95d2d0b470b Author: Nick Mathewson Date: Mon Jan 7 10:21:59 2019 -0500 Bump to 0.3.3.11 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/release-0.3.5] Write a releasenotes file for 0.3.5.7

2019-01-07 Thread nickm
commit 75dd7f0210586173b658d1450d2ada06500aaf83 Author: Nick Mathewson Date: Mon Jan 7 09:52:16 2019 -0500 Write a releasenotes file for 0.3.5.7 --- ChangeLog| 2 +- ReleaseNotes | 726 +++ 2 files changed, 727 insertions(+), 1

[tor-commits] [tor/release-0.3.4] 0.3.4.10 : releasenotes

2019-01-07 Thread nickm
commit 2ad0c9811b179361afe64289f3ecdf1ea285bf6a Author: Nick Mathewson Date: Mon Jan 7 10:09:53 2019 -0500 0.3.4.10 : releasenotes --- ReleaseNotes | 116 +++ 1 file changed, 116 insertions(+) diff --git a/ReleaseNotes

[tor-commits] [tor/release-0.3.4] Remove the changes files that went into the 0.3.4.10 changelog

2019-01-07 Thread nickm
commit 248056d9dbc0fb08d3f18872b8fda88dc09a3478 Author: Nick Mathewson Date: Mon Jan 7 10:10:33 2019 -0500 Remove the changes files that went into the 0.3.4.10 changelog --- changes/bug24104 | 4 changes/bug27750 | 6 -- changes/bug28245 | 6 --

[tor-commits] [tor/release-0.3.3] ChangeLog and ReleaseNotes for 0.3.3.11

2019-01-07 Thread nickm
commit 2d279eaa96bde700e73479e7f03191b61760ae95 Author: Nick Mathewson Date: Mon Jan 7 10:20:20 2019 -0500 ChangeLog and ReleaseNotes for 0.3.3.11 --- ChangeLog| 173 +++ ReleaseNotes | 173

[tor-commits] [tor/release-0.3.5] Bump to 0.3.4.10

2019-01-07 Thread nickm
commit ea47563dd7da134e8adfa8bff0515ee925318013 Author: Nick Mathewson Date: Mon Jan 7 10:22:42 2019 -0500 Bump to 0.3.4.10 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/release-0.3.4] Bump to 0.3.4.10

2019-01-07 Thread nickm
commit ea47563dd7da134e8adfa8bff0515ee925318013 Author: Nick Mathewson Date: Mon Jan 7 10:22:42 2019 -0500 Bump to 0.3.4.10 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/release-0.3.5] Bump version to 0.3.5.7

2019-01-07 Thread nickm
commit 52b508735f4e3a58e6d9c808f7815bba66f5190e Author: Nick Mathewson Date: Mon Jan 7 10:23:21 2019 -0500 Bump version to 0.3.5.7 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [sbws/master] config: stop allowing http servers without tls

2019-01-07 Thread juga
commit 1b2af9b8f0bbbfe22b8ee5c4c361f2535509987c Author: juga0 Date: Fri Dec 14 14:02:11 2018 + config: stop allowing http servers without tls Destinations' Web servers must support TLS to avoid contents cache. Fixes bug #28789. Bugfix v0.2.0. ---

[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/doc28805'

2019-01-07 Thread nickm
commit 0402746a990a496ccd82708f5b676b4eca0521fa Merge: 7a7685955 8eadfad71 Author: Nick Mathewson Date: Mon Jan 7 08:51:37 2019 -0500 Merge remote-tracking branch 'rl1987/doc28805' changes/doc28805 | 4 doc/tor.1.txt| 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)

[tor-commits] [tor/master] Tweak ControlPort description in manpage

2019-01-07 Thread nickm
commit 8eadfad71daaad985ac1262436bc232d4b184d71 Author: rl1987 Date: Sun Dec 23 19:58:25 2018 +0200 Tweak ControlPort description in manpage --- changes/doc28805 | 4 doc/tor.1.txt| 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/doc28805

[tor-commits] [sbws/master] CI: include deb.torproject.org key

2019-01-07 Thread juga
commit 2f53da623d8875db05a23d5b7bfbd251bc470c36 Author: juga0 Date: Fri Dec 21 09:04:31 2018 + CI: include deb.torproject.org key so that CI doesn't fail because of timeout trying to retrieve the key. Closes #28922. Bugfix v1.0.3-dev0 --- .travis.yml

[tor-commits] [sbws/master] Merge branch 'bug28922'

2019-01-07 Thread juga
commit 64aba2944ef3a1f9721687c3afcd3eeb51e5a7fb Merge: b7241f1 2f53da6 Author: juga0 Date: Mon Jan 7 10:52:29 2019 + Merge branch 'bug28922' .travis.yml | 3 +- tests/deb.torproject.org.asc | 708 +++ 2 files changed, 709

[tor-commits] [tech-reports/master] Change 'grant' to 'contract' in CollecTor report.

2019-01-07 Thread karsten
commit 8a0eb83f36cf87db2ece8754b5690caa914a4cc7 Author: Karsten Loesing Date: Mon Jan 7 14:30:49 2019 +0100 Change 'grant' to 'contract' in CollecTor report. --- 2018/modern-collector/modern-collector.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-01-07 Thread translation
commit efc4cf206ff73fda36624d258eaddd55e8149636 Author: Translation commit bot Date: Mon Jan 7 09:47:31 2019 + Update translations for tbmanual-contentspot --- contents+ru.po | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contents+ru.po b/contents+ru.po

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

2019-01-07 Thread translation
commit 3c334a146bf5fe07003300dc203ce452951349f8 Author: Translation commit bot Date: Mon Jan 7 09:46:29 2019 + Update translations for tails-iuk --- ru.po | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ru.po b/ru.po index 71883a1e1..2728385d0 100644

[tor-commits] [tor/master] Merge remote-tracking branch 'tlyu-github/bug28929'

2019-01-07 Thread nickm
commit 7a7685955ec9ba464aee0ad67523219c3ad70f84 Merge: fe26e1f1c 7e7531171 Author: Nick Mathewson Date: Mon Jan 7 08:46:27 2019 -0500 Merge remote-tracking branch 'tlyu-github/bug28929' src/feature/control/control_bootstrap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Fix typo in bootstrap message

2019-01-07 Thread nickm
commit 7e753117146266fa39841b4cc9fa63febfe9e92a Author: Taylor Yu Date: Fri Jan 4 17:23:52 2019 -0600 Fix typo in bootstrap message The message for the "ap_conn_proxy" bootstrap status tag was missing some text. Fixes bug 28929. Bug not in any released Tor. ---

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

2019-01-07 Thread translation
commit 0a2915f0902bc65c8b93ba4eeb53fff8cb9d1160 Author: Translation commit bot Date: Mon Jan 7 13:45:49 2019 + Update translations for liveusb-creator --- es_AR/es_AR.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po

[tor-commits] [sbws/master] Merge branch 'bug28789'

2019-01-07 Thread juga
commit b7241f1a7cee478f26dd28895bea8872a9edc892 Merge: b0c67fd 1b2af9b Author: juga0 Date: Mon Jan 7 10:49:11 2019 + Merge branch 'bug28789' sbws/lib/destination.py| 3 --- sbws/util/config.py| 10 +++--- tests/integration/conftest.py | 3 +++

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

2019-01-07 Thread nickm
commit ba71b178655fcec2ad55383987001d2fd6a3873d Merge: fee2eaf2d 445d6750f Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit 3d18903f53081cc31bd74d10632d1319ed5eba48 Merge: d7259b64d ba71b1786 Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit ba71b178655fcec2ad55383987001d2fd6a3873d Merge: fee2eaf2d 445d6750f Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit 3d18903f53081cc31bd74d10632d1319ed5eba48 Merge: d7259b64d ba71b1786 Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit ba71b178655fcec2ad55383987001d2fd6a3873d Merge: fee2eaf2d 445d6750f Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit fe26e1f1c83b641827da7794beb4faf23fad6e97 Merge: 41e3c760a 85c5f5850 Author: Nick Mathewson Date: Mon Jan 7 08:43:46 2019 -0500 Merge branch 'maint-0.3.5' changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599 ++---

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-01-07 Thread translation
commit 81d9cec65cd0bec855257d5732df545677acf71a Author: Translation commit bot Date: Mon Jan 7 09:45:23 2019 + Update translations for donatepages-messagespot --- locale/ru/LC_MESSAGES/messages.po | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git

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

2019-01-07 Thread translation
commit 340006b77824c8d8b2021bb30688e2f10b8f8234 Author: Translation commit bot Date: Mon Jan 7 09:46:02 2019 + Update translations for liveusb-creator_completed --- ru/ru.po | 169 ++- 1 file changed, 90 insertions(+), 79

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-01-07 Thread translation
commit 2131fbd66e24a28738afbadd4b8473c12ba0ee37 Author: Translation commit bot Date: Mon Jan 7 10:15:24 2019 + Update translations for donatepages-messagespot --- locale/ru/LC_MESSAGES/messages.po | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git

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

2019-01-07 Thread nickm
commit 3d18903f53081cc31bd74d10632d1319ed5eba48 Merge: d7259b64d ba71b1786 Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit 3d18903f53081cc31bd74d10632d1319ed5eba48 Merge: d7259b64d ba71b1786 Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit 85c5f58509898bf8236ccb8998556f1ab688cb05 Merge: 74bda3079 3d18903f5 Author: Nick Mathewson Date: Mon Jan 7 08:43:46 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit ad70dd403bfe1fb5559588e16ff8bef231bce023 Merge: e403f8806 445d6750f Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit ba71b178655fcec2ad55383987001d2fd6a3873d Merge: fee2eaf2d 445d6750f Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit cd9a85a5228b85dc3ef623fcf9942d410c24f0f5 Merge: cd446a6fd 85c5f5850 Author: Nick Mathewson Date: Mon Jan 7 08:43:46 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit 0c75f83625864779aac92684fb9b764e05adf135 Merge: cba5c8829 ba71b1786 Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit ba71b178655fcec2ad55383987001d2fd6a3873d Merge: fee2eaf2d 445d6750f Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit 3d18903f53081cc31bd74d10632d1319ed5eba48 Merge: d7259b64d ba71b1786 Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit 28c95ed3fa2e9205cd78c6dc5f5a021249f7b543 Merge: 366e9ba84 3d18903f5 Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.3.4' into release-0.3.4 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit ba71b178655fcec2ad55383987001d2fd6a3873d Merge: fee2eaf2d 445d6750f Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

2019-01-07 Thread nickm
commit ba71b178655fcec2ad55383987001d2fd6a3873d Merge: fee2eaf2d 445d6750f Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-01-07 Thread nickm
commit 85c5f58509898bf8236ccb8998556f1ab688cb05 Merge: 74bda3079 3d18903f5 Author: Nick Mathewson Date: Mon Jan 7 08:43:46 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-01-07 Thread nickm
commit 85c5f58509898bf8236ccb8998556f1ab688cb05 Merge: 74bda3079 3d18903f5 Author: Nick Mathewson Date: Mon Jan 7 08:43:46 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-01-07 Thread translation
commit 923ac4901af4e7684dc79ec5012671e01d18c41f Author: Translation commit bot Date: Mon Jan 7 14:15:24 2019 + Update translations for donatepages-messagespot --- locale/es/LC_MESSAGES/messages.po| 10 +++--- locale/es_AR/LC_MESSAGES/messages.po | 10 +++--- 2 files

[tor-commits] [translation/support-portal] Update translations for support-portal

2019-01-07 Thread translation
commit 3244ee84e6ad50119681f6becc42b45fe219214d Author: Translation commit bot Date: Mon Jan 7 09:49:52 2019 + Update translations for support-portal --- contents+ru.po | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/contents+ru.po

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

2019-01-07 Thread translation
commit 4ea53e0dfab1392666e7d715db78faaab41d95cd Author: Translation commit bot Date: Mon Jan 7 09:45:55 2019 + Update translations for liveusb-creator --- ru/ru.po | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index

[tor-commits] [tor/release-0.3.5] Add geoip entry to 0.3.5.7 changelog

2019-01-07 Thread nickm
commit f0faee06774fc541d5e679083d4075d95628523b Author: Nick Mathewson Date: Mon Jan 7 09:09:50 2019 -0500 Add geoip entry to 0.3.5.7 changelog --- ChangeLog| 4 changes/geoip-2019-01-03 | 4 2 files changed, 4 insertions(+), 4 deletions(-) diff --git

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

2019-01-07 Thread translation
commit 7e99dbde18ff2ca3b70021eb2556a442c8ffbfba Author: Translation commit bot Date: Mon Jan 7 09:46:34 2019 + Update translations for tails-iuk_completed --- ru.po | 89 --- 1 file changed, 53 insertions(+), 36

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

2019-01-07 Thread translation
commit 42d86808201bd0f4a6d10c4f393ad944661d3c74 Author: Translation commit bot Date: Mon Jan 7 19:46:38 2019 + Update translations for tails-perl5lib --- lt.po | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lt.po b/lt.po index 871dc494f..8230fa01f

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

2019-01-07 Thread translation
commit e76ce606e616073286452a6c3b46589cc51a8138 Author: Translation commit bot Date: Mon Jan 7 19:46:02 2019 + Update translations for liveusb-creator --- lt/lt.po | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lt/lt.po b/lt/lt.po index

[tor-commits] [tor/release-0.3.5] mark #27841 as major

2019-01-07 Thread arma
commit 9beb085c10562a257c08abcee43434533d4fa96e Author: Roger Dingledine Date: Mon Jan 7 12:41:02 2019 -0500 mark #27841 as major --- ReleaseNotes | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ReleaseNotes b/ReleaseNotes index 9707fb9b5..71cd5df04 100644

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

2019-01-07 Thread translation
commit 5d137ba814069ec49e65ec8c34e1698d45570584 Author: Translation commit bot Date: Mon Jan 7 19:15:51 2019 + Update translations for liveusb-creator --- lt/lt.po | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lt/lt.po b/lt/lt.po index

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2019-01-07 Thread translation
commit 2f3be2dc707e5fc49b542238c70c7c10022bfa4e Author: Translation commit bot Date: Mon Jan 7 19:49:42 2019 + Update translations for tor-launcher-network-settings --- lt/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

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

2019-01-07 Thread translation
commit 689fbb513514c828ae9cf6bb081e117b88ebe489 Author: Translation commit bot Date: Mon Jan 7 20:45:53 2019 + Update translations for liveusb-creator --- fr/fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 65f1e27cd..fa12f8616

[tor-commits] [tech-reports/master] Fix typo in Nick's surname.

2019-01-07 Thread karsten
commit 490fad2f6885b5969bec5760b56d7a0e7e8c18b0 Author: Karsten Loesing Date: Mon Jan 7 20:56:46 2019 +0100 Fix typo in Nick's surname. --- 2018/modern-collector/modern-collector.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/release-0.3.3] fix issues noted by traumschule

2019-01-07 Thread arma
commit 801af9a7e3f0f8c68294d8dd212b2eedcb481b72 Author: Roger Dingledine Date: Mon Jan 7 12:46:18 2019 -0500 fix issues noted by traumschule plus fix a bonus typo --- ReleaseNotes | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git

[tor-commits] [tor/release-0.3.5] Update to 0.3.4.10-dev

2019-01-07 Thread nickm
commit 41bb77822777b261991b74d2f7fb4dcad587c8c0 Author: Nick Mathewson Date: Mon Jan 7 21:17:34 2019 -0500 Update to 0.3.4.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

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

2019-01-07 Thread nickm
commit 7b792b990c49ddbca782ee342bc6b0805b3f0868 Merge: 801af9a7e b5fdb91ad Author: Nick Mathewson Date: Mon Jan 7 21:18:47 2019 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

[tor-commits] [tor/maint-0.3.4] Update to 0.3.3.3.11-dev

2019-01-07 Thread nickm
commit b5fdb91adaad7fd863856ad505665908bd24ea15 Author: Nick Mathewson Date: Mon Jan 7 21:16:40 2019 -0500 Update to 0.3.3.3.11-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

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

2019-01-07 Thread nickm
commit 50a686e586c0208e7aa9c3ea4e0210ab73cc0b71 Merge: ea47563dd b5fdb91ad Author: Nick Mathewson Date: Mon Jan 7 21:16:56 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "Ours" to avoid version bump. ___ tor-commits mailing

[tor-commits] [tor/maint-0.3.5] Update to 0.3.3.3.11-dev

2019-01-07 Thread nickm
commit b5fdb91adaad7fd863856ad505665908bd24ea15 Author: Nick Mathewson Date: Mon Jan 7 21:16:40 2019 -0500 Update to 0.3.3.3.11-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/release-0.3.3] Update to 0.3.3.3.11-dev

2019-01-07 Thread nickm
commit b5fdb91adaad7fd863856ad505665908bd24ea15 Author: Nick Mathewson Date: Mon Jan 7 21:16:40 2019 -0500 Update to 0.3.3.3.11-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

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

2019-01-07 Thread nickm
commit 50a686e586c0208e7aa9c3ea4e0210ab73cc0b71 Merge: ea47563dd b5fdb91ad Author: Nick Mathewson Date: Mon Jan 7 21:16:56 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "Ours" to avoid version bump. ___ tor-commits mailing

[tor-commits] [tor/master] Update to 0.3.5.7-dev

2019-01-07 Thread nickm
commit 44edfa7adcc3f9006397e525b0c4e333ea4ee429 Author: Nick Mathewson Date: Mon Jan 7 21:18:25 2019 -0500 Update to 0.3.5.7-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/release-0.3.4] Update to 0.3.4.10-dev

2019-01-07 Thread nickm
commit 41bb77822777b261991b74d2f7fb4dcad587c8c0 Author: Nick Mathewson Date: Mon Jan 7 21:17:34 2019 -0500 Update to 0.3.4.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/release-0.3.5] Update to 0.3.3.3.11-dev

2019-01-07 Thread nickm
commit b5fdb91adaad7fd863856ad505665908bd24ea15 Author: Nick Mathewson Date: Mon Jan 7 21:16:40 2019 -0500 Update to 0.3.3.3.11-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

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

2019-01-07 Thread nickm
commit 50a686e586c0208e7aa9c3ea4e0210ab73cc0b71 Merge: ea47563dd b5fdb91ad Author: Nick Mathewson Date: Mon Jan 7 21:16:56 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "Ours" to avoid version bump. ___ tor-commits mailing

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

2019-01-07 Thread nickm
commit ae578981b6c43fbf9e13d0e74806ca6153edf7a9 Merge: d19951970 44edfa7ad Author: Nick Mathewson Date: Mon Jan 7 21:18:33 2019 -0500 Merge branch 'maint-0.3.5' "ours" to avoid version bump ___ tor-commits mailing list

  1   2   >