[tor-commits] [tpo/staging] update pronoun

2019-06-05 Thread emmapeel
commit dec5b24ae8f54c173298502c666f40d2305f9b0a Author: emma peel Date: Mon Jun 3 21:22:02 2019 +0200 update pronoun --- content/about/people/catalyst/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/people/catalyst/contents.lr

[tor-commits] [tpo/staging] Merge branch 'master' into staging

2019-06-05 Thread emmapeel
commit 1a1c2aa8b222a173fc5c0a8e1b1ef5f7d890bc3f Merge: a848be0 2dfd5f7 Author: emma peel Date: Wed Jun 5 16:19:25 2019 +0200 Merge branch 'master' into staging content/menu/contents.lr | 2 +- databags/versions.ini| 4 ++-- models/sponsors.ini | 1 + 3 files changed, 4

[tor-commits] [tor/master] hs: Implement a helper to repurpose a circuit

2019-06-05 Thread nickm
commit 3789f22bcbfbc6de415a838e4c4bfb2555c7d6c3 Author: David Goulet Date: Tue May 28 09:44:06 2019 -0400 hs: Implement a helper to repurpose a circuit When we repurpose a hidden service circuit, we need to clean up from the HS circuit map and any HS related data structured

[tor-commits] [tor/master] test: Add test_hs_circ.c for HS circuit testing

2019-06-05 Thread nickm
commit 41b94722e5c93ec06911f9c63296a65ce295c1ea Author: David Goulet Date: Fri May 31 10:43:01 2019 -0400 test: Add test_hs_circ.c for HS circuit testing For now, only tests HS circuit repurpose function. Part of #29034 Signed-off-by: David Goulet ---

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1053'

2019-06-05 Thread nickm
commit b39a8d315dcbfae002c6ced7434b6afd5a5670d1 Merge: 0c16ec4c0 41b94722e Author: Nick Mathewson Date: Wed Jun 5 09:04:09 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1053' changes/bug29034 | 5 src/core/or/circuituse.c | 6

[tor-commits] [tor/master] practracker update

2019-06-05 Thread nickm
commit ae490189f8fc5291152ce9a49b5b8a5b0e1ddf1a Author: Nick Mathewson Date: Wed Jun 5 09:06:43 2019 -0400 practracker update --- scripts/maint/practracker/exceptions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt

[tor-commits] [tor/master] Regenerate practracker excpetions file

2019-06-05 Thread nickm
commit 2926f49b24938fee8a3e33357687eb2831eb62e0 Author: Nick Mathewson Date: Wed Jun 5 09:34:14 2019 -0400 Regenerate practracker excpetions file --- scripts/maint/practracker/exceptions.txt | 64 ++-- 1 file changed, 28 insertions(+), 36 deletions(-) diff

[tor-commits] [tor/master] Replace a missing end-of-comment string

2019-06-05 Thread nickm
commit 892a313b6a9edbcb1930454b424503c4cc2c791a Author: Nick Mathewson Date: Wed Jun 5 09:35:45 2019 -0400 Replace a missing end-of-comment string This happened when I went to fix long lines after running "make autostyle". --- src/lib/tls/tortls_openssl.c | 2 +- 1 file

[tor-commits] [tor/master] minor changelog edits

2019-06-05 Thread nickm
commit 7f341d64828d48ebaf4bfaa2720c614a25c8dbba Author: Nick Mathewson Date: Wed Jun 5 09:43:43 2019 -0400 minor changelog edits --- ChangeLog | 45 +++-- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [community/staging] Move images to section subfolder

2019-06-05 Thread pili
commit 5e52e407332e411bc44bfc349c1cff6dd8aa620e Author: Pili Guerra Date: Thu May 30 13:34:01 2019 +0200 Move images to section subfolder --- .../images/onion-services/tor-onion-services-1.png | Bin 17222 -> 0 bytes .../images/onion-services/tor-onion-services-2.png | Bin 19207

[tor-commits] [community/staging] Start adding onion services content

2019-06-05 Thread pili
commit 187b36ad840f624f0cecf1a82205c9c8cc49df04 Author: Pili Guerra Date: Thu May 30 11:24:09 2019 +0200 Start adding onion services content --- .../images/onion-services/tor-onion-services-1.png | Bin 0 -> 17222 bytes .../images/onion-services/tor-onion-services-2.png | Bin 0

[tor-commits] [community/staging] Onion services

2019-06-05 Thread pili
commit 2680fbaf327de82adec7e106baeae0d50e8710ed Author: Pili Guerra Date: Thu May 30 13:53:53 2019 + Onion services --- content/onion-services/setup/contents.lr | 3 +++ 1 file changed, 3 insertions(+) diff --git a/content/onion-services/setup/contents.lr

[tor-commits] [community/staging] Add links and Calls to Action

2019-06-05 Thread pili
commit 0410032427414d4073b5f0773aef80cb95265b0d Author: Pili Guerra Date: Thu May 30 13:35:11 2019 +0200 Add links and Calls to Action --- content/onion-services/setup/contents.lr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Bump to 0.4.1.2-alpha

2019-06-05 Thread nickm
commit d1b02456c107256ee562b36b0ef2f5544eb27cee Author: Nick Mathewson Date: Wed Jun 5 09:25:21 2019 -0400 Bump to 0.4.1.2-alpha --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/master] Start a changelog for 0.4.1.2-alpha

2019-06-05 Thread nickm
commit 0982d0136996179e1c4bcf26d2890e12301f6aad Author: Nick Mathewson Date: Wed Jun 5 09:24:18 2019 -0400 Start a changelog for 0.4.1.2-alpha --- ChangeLog | 115 changes/bug29034| 5 --- changes/bug29670| 4 --

[tor-commits] [tor/master] Rewrap the changelog

2019-06-05 Thread nickm
commit d2de899bf4f954e0886b88f4ee2562a13f49a716 Author: Nick Mathewson Date: Wed Jun 5 09:24:42 2019 -0400 Rewrap the changelog --- ChangeLog | 128 -- 1 file changed, 66 insertions(+), 62 deletions(-) diff --git a/ChangeLog

<    1   2