April 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.0] hs: Expose hs_service.c functions for unit tests
by nickm＠torproject.org 04 Apr '17

04 Apr '17

commit 751958434792122e9363b54e499a30b2d83b8536 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 4 08:35:31 2017 -0400 hs: Expose hs_service.c functions for unit tests In order to avoid src/or/hs_service.o to contain no symbols and thus making clang throw a warning, the functions are now exposed not just to unit tests. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug21825 | 6 ++++++ src/or/hs_service.c | 12 +++----… [View More]----- src/or/hs_service.h | 15 +++++---------- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/changes/bug21825 b/changes/bug21825 new file mode 100644 index 0000000..8f14b32 --- /dev/null +++ b/changes/bug21825 @@ -0,0 +1,6 @@ + o Minor bugfix (compilation): + - Functions in hs_service.c was only compiled for unit test making the + created object (.o) contain no symbols in src/or/libor.a resulting in a + compilation warning from clang. We now expose those functions for the + unit tests. This will be changed in 0.3.2 release. Fixes bug 21825.; + bugfix on tor-0.3.0.1-alpha. diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 7b12b63..8687403 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -6,8 +6,6 @@ * \brief Implement next generation hidden service functionality **/ -#define HS_SERVICE_PRIVATE - #include "or.h" #include "relay.h" #include "rendservice.h" @@ -22,14 +20,12 @@ /* XXX We don't currently use these functions, apart from generating unittest data. When we start implementing the service-side support for prop224 we - should revisit these functions and use them. For now we mark them as - unittest-only code: */ -#ifdef TOR_UNIT_TESTS + should revisit these functions and use them. */ /** Given an ESTABLISH_INTRO <b>cell</b>, encode it and place its payload in * <b>buf_out</b> which has size <b>buf_out_len</b>. Return the number of * bytes written, or a negative integer if there was an error. */ -STATIC ssize_t +ssize_t get_establish_intro_payload(uint8_t *buf_out, size_t buf_out_len, const hs_cell_establish_intro_t *cell) { @@ -59,7 +55,7 @@ set_cell_extensions(hs_cell_establish_intro_t *cell) * return an ESTABLISH_INTRO cell. Return NULL if something went wrong. The * returned cell is allocated on the heap and it's the responsibility of the * caller to free it. */ -STATIC hs_cell_establish_intro_t * +hs_cell_establish_intro_t * generate_establish_intro_cell(const uint8_t *circuit_key_material, size_t circuit_key_material_len) { @@ -174,5 +170,3 @@ generate_establish_intro_cell(const uint8_t *circuit_key_material, return NULL; } -#endif /* TOR_UNIT_TESTS */ - diff --git a/src/or/hs_service.h b/src/or/hs_service.h index 994521f..5d2d8dc 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -12,21 +12,16 @@ #include "or.h" #include "hs/cell_establish_intro.h" -#ifdef HS_SERVICE_PRIVATE +/* These functions are only used by unit tests and we need to expose them else + * hs_service.o ends up with no symbols in libor.a which makes clang throw a + * warning at compile time. See #21825. */ -#ifdef TOR_UNIT_TESTS - -STATIC hs_cell_establish_intro_t * +hs_cell_establish_intro_t * generate_establish_intro_cell(const uint8_t *circuit_key_material, size_t circuit_key_material_len); - -STATIC ssize_t +ssize_t get_establish_intro_payload(uint8_t *buf, size_t buf_len, const hs_cell_establish_intro_t *cell); -#endif /* TOR_UNIT_TESTS */ - -#endif /* HS_SERVICE_PRIVATE */ - #endif /* TOR_HS_SERVICE_H */ [View Less]

1 0

[tor/master] hs: Expose hs_service.c functions for unit tests
by nickm＠torproject.org 04 Apr '17

04 Apr '17

commit 751958434792122e9363b54e499a30b2d83b8536 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 4 08:35:31 2017 -0400 hs: Expose hs_service.c functions for unit tests In order to avoid src/or/hs_service.o to contain no symbols and thus making clang throw a warning, the functions are now exposed not just to unit tests. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug21825 | 6 ++++++ src/or/hs_service.c | 12 +++----… [View More]----- src/or/hs_service.h | 15 +++++---------- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/changes/bug21825 b/changes/bug21825 new file mode 100644 index 0000000..8f14b32 --- /dev/null +++ b/changes/bug21825 @@ -0,0 +1,6 @@ + o Minor bugfix (compilation): + - Functions in hs_service.c was only compiled for unit test making the + created object (.o) contain no symbols in src/or/libor.a resulting in a + compilation warning from clang. We now expose those functions for the + unit tests. This will be changed in 0.3.2 release. Fixes bug 21825.; + bugfix on tor-0.3.0.1-alpha. diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 7b12b63..8687403 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -6,8 +6,6 @@ * \brief Implement next generation hidden service functionality **/ -#define HS_SERVICE_PRIVATE - #include "or.h" #include "relay.h" #include "rendservice.h" @@ -22,14 +20,12 @@ /* XXX We don't currently use these functions, apart from generating unittest data. When we start implementing the service-side support for prop224 we - should revisit these functions and use them. For now we mark them as - unittest-only code: */ -#ifdef TOR_UNIT_TESTS + should revisit these functions and use them. */ /** Given an ESTABLISH_INTRO <b>cell</b>, encode it and place its payload in * <b>buf_out</b> which has size <b>buf_out_len</b>. Return the number of * bytes written, or a negative integer if there was an error. */ -STATIC ssize_t +ssize_t get_establish_intro_payload(uint8_t *buf_out, size_t buf_out_len, const hs_cell_establish_intro_t *cell) { @@ -59,7 +55,7 @@ set_cell_extensions(hs_cell_establish_intro_t *cell) * return an ESTABLISH_INTRO cell. Return NULL if something went wrong. The * returned cell is allocated on the heap and it's the responsibility of the * caller to free it. */ -STATIC hs_cell_establish_intro_t * +hs_cell_establish_intro_t * generate_establish_intro_cell(const uint8_t *circuit_key_material, size_t circuit_key_material_len) { @@ -174,5 +170,3 @@ generate_establish_intro_cell(const uint8_t *circuit_key_material, return NULL; } -#endif /* TOR_UNIT_TESTS */ - diff --git a/src/or/hs_service.h b/src/or/hs_service.h index 994521f..5d2d8dc 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -12,21 +12,16 @@ #include "or.h" #include "hs/cell_establish_intro.h" -#ifdef HS_SERVICE_PRIVATE +/* These functions are only used by unit tests and we need to expose them else + * hs_service.o ends up with no symbols in libor.a which makes clang throw a + * warning at compile time. See #21825. */ -#ifdef TOR_UNIT_TESTS - -STATIC hs_cell_establish_intro_t * +hs_cell_establish_intro_t * generate_establish_intro_cell(const uint8_t *circuit_key_material, size_t circuit_key_material_len); - -STATIC ssize_t +ssize_t get_establish_intro_payload(uint8_t *buf, size_t buf_len, const hs_cell_establish_intro_t *cell); -#endif /* TOR_UNIT_TESTS */ - -#endif /* HS_SERVICE_PRIVATE */ - #endif /* TOR_HS_SERVICE_H */ [View Less]

1 0

[tor/master] Merge branch 'maint-0.3.0'
by nickm＠torproject.org 04 Apr '17

04 Apr '17

commit 321c1c453e4ee757be7df823da28b0f4af7ae60a Merge: b1c7e5d 7519584 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 4 09:43:23 2017 -0400 Merge branch 'maint-0.3.0' changes/bug21825 | 6 ++++++ src/or/hs_service.c | 12 +++--------- src/or/hs_service.h | 15 +++++---------- 3 files changed, 14 insertions(+), 19 deletions(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 04 Apr '17

04 Apr '17

commit b2e500f95b7f685b05da5702e62944dbaa9faef2 Merge: 91c60d7 7519584 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 4 09:43:16 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug21825 | 6 ++++++ src/or/hs_service.c | 12 +++--------- src/or/hs_service.h | 15 +++++---------- 3 files changed, 14 insertions(+), 19 deletions(-)

1 0

[webwml/master] Add editor/writer job ad
by hiro＠torproject.org 04 Apr '17

04 Apr '17

commit 11598192ca97ec4753b00897fbb6c513b67d6a6e Author: hiromipaw <hiro(a)torproject.org> Date: Tue Apr 4 15:20:30 2017 +0200 Add editor/writer job ad --- about/en/jobs-editor.wml | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ about/en/jobs.wml | 38 +++++++++++++--------------- 2 files changed, 83 insertions(+), 21 deletions(-) diff --git a/about/en/jobs-editor.wml b/about/en/jobs-editor.wml new file mode 100644 index 0000000..00c5e49 --- /dev/null +++ b/about/en/… [View More]jobs-editor.wml @@ -0,0 +1,66 @@ +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 3-low + +#include "head.wmi" TITLE="Experienced Writer/Editor Sought for Internet Freedom Nonprofit" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> + <a href="<page about/overview>">About » </a> + <a href="<page about/jobs>">Jobs</a> + </div> + <div id="maincol"> + +<h1>Director of Communications</h1> + + +<p> The Tor Project, Inc., a 501(c)(3) nonprofit organization that provides technical infrastructure for privacy protection over the Internet, is seeking a strong writer/editor to help us tell the world about our important work. The ideal candidate will be familiar with issues involving high tech freedom and can make a compelling case about why our work is so important to current and potential funders. This person must be able to write clearly and provide context for the Tor Project’s complicated technology and activism projects. The ability to explain technical concepts to non-technical audiences is essential.</p> + + +<p>The writer/editor is responsible for researching grant opportunities, sending out letters of inquiry and proposals to foundations, keeping track of dates and deadlines, and submitting reports at the end of the grant periods. The Tor Project consists of six teams that each own multiple sub-projects with different needs and priorities. The writer/editor will need to build a grant proposal pipeline by organizing our ideas and needs into a database that can be accessed as opportunities present themselves while coordinating prioritization with our leadership team.</p> + + +<p>This person is also responsible for additional writing and editing related to other development functions, such as updating the "one-pagers" we distribute at conferences, editing membership emails that go out to our constituents, and writing our annual report. The Tor Project works on Internet freedom issues, and in many ways, our grant proposals and reports are more like activism pieces than traditional pleas for funding, so a background in writing about these issues would be ideal.</p> + +<h2>Qualifications:</h2> + +<ul> + <li>Excellent verbal, written, and editing skills in English; fluency in other languages is a plus.</li> + <li>Comfortable with highly technical topics and ability to explain them clearly and accurately to non-technical audiences.</li> + <li>Knowledge of and appreciation for the free and open source software movement.</li> + <li>Strong generalist understanding of the basic mechanics of how the Internet works, as well as issues related to privacy, security, censorship, and surveillance.</li> + <li>Experience with, or willingness to learn how to use, communications and collaboration technologies such as PGP, IRC, Jitsi, WordPress, and etherpads.</li> + <li>Hard working and highly organized with superior attention to detail.</li> + <li>Highly collaborative with experience working with and as part of remote teams.</li> + <li>Self-starter who thrives on working independently with a dispersed workforce.</li> + <li>Experience working or living outside the United States is a plus.</li> + <li>Fundraising and fundraising communications experience is a plus.</li> + <li>Willingness to travel to international meetings twice a year.</li> + <li>Excellent social skills and a sense of humor.</li> +</ul> + +<p>The ideal candidate will be energetic, unflappable and flexible, and will thrive in a highly-technical collaborative environment.</p> + +<p>The Tor Project's workforce is smart and committed. Experience working with open source communities and/or a dedication to Internet freedom are added pluses. The Tor Project currently has a paid and contract staff of around 25 developers and operational support staff, plus many thousands of volunteers who contribute to our work. The Tor Project is funded in part by government research and development grants, and in part by individual, foundation and corporate donations.</p> + +<p>Flexible salary, depending on experience. The Tor Project has a competitive benefits package, including a generous PTO policy; 13 paid holidays per year (including the week between Christmas and New Year's, when the office is closed); health, vision, dental, disability, and life insurance paid in full for employee; flexible work schedule; and occasional travel opportunities.</p> + +<p>This is a full-time position. The Tor Project’s main office is in Seattle, and we’d be delighted to supply a desk for this position there, however, this job can be done remotely.</p> + +<p>To apply, send a cover letter and your resume to <a href="mailto:hr@torproject.org">hr(a)torproject.org</a> with the subject "Writer/Editor." Tell us why you think you're the right person for this job, and please include links to writing samples. No phone calls please!</p> + +<p>The Tor Project, Inc., is an equal opportunity, affirmative action employer.</p> + + +<p>(Updated 4 April 2017.)</p> + + </div> +  + <div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi> diff --git a/about/en/jobs.wml b/about/en/jobs.wml index a1500db..27266a0 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -12,32 +12,28 @@ <div id="maincol"> <h1>The Tor Project is always looking for more great people to join our team!</h1> - <p>At the moment, we don't have any official open positions. Please check back - soon, though! In the meantime, you may want to glance at our - <a href="<page getinvolved/volunteer>">volunteers</a> page.</p> + #<p>At the moment, we don't have any official open positions. Please check back + #soon, though! In the meantime, you may want to glance at our + #<a href="<page getinvolved/volunteer>">volunteers</a> page.</p> # - #<p>Specifically, we're looking for the following people currently:</p> - #<ul> - #<li><a href="<page about/jobs-comm-director>">Communications Director</a></li> - #<li><a href="<page about/jobs-ooni-ux-designer>">UX Designer - OONI</a></li> - #<li><a href="<page about/jobs-coredev>">Core Developer</a></li> - #<li><a href="<page about/jobs-editor>">Writer/Editor</a></li> - #<li><a href="<page about/jobs-admin-assistant>">Administrative Assistant</a></li> - #</ul> - #</p> + <p>Specifically, we're looking for the following people currently:</p> + <ul> + <li><a href="<page about/jobs-editor>">Writer/Editor</a></li> + </ul> + <p>In the past, we looked for the following people:</p> <ul> - <li>Core developer</li> - <li>Support assistants and translators</li> - <li>Browser hacker</li> - <li>Pluggable transport developer</li> - <li>Lead Automation Engineer</li> - <li>Firefox/Thunderbird Extension Developer</li> - <li>Director of Communications</li> - <li>Executive Director</li> - <li>Executive Administrator</li> + <li>Core developer</li> + <li>Support assistants and translators</li> + <li>Browser hacker</li> + <li>Pluggable transport developer</li> + <li>Lead Automation Engineer</li> + <li>Firefox/Thunderbird Extension Developer</li> + <li>Director of Communications</li> + <li>Executive Director</li> + <li>Executive Administrator</li> </ul> <p> [View Less]

1 0

[webwml/master] Fix title in editor job page
by hiro＠torproject.org 04 Apr '17

04 Apr '17

commit e2a9fe264c7f584933b629b88eeeedaa4b231ba8 Author: hiromipaw <hiro(a)torproject.org> Date: Tue Apr 4 15:28:11 2017 +0200 Fix title in editor job page --- about/en/jobs-editor.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/jobs-editor.wml b/about/en/jobs-editor.wml index 00c5e49..228e2c4 100644 --- a/about/en/jobs-editor.wml +++ b/about/en/jobs-editor.wml @@ -11,7 +11,7 @@ </div> <div id="maincol"> -<h1>Director of … [View More]

1 0

[webwml/staging] Fix title in editor job page
by hiro＠torproject.org 04 Apr '17

04 Apr '17

commit e2a9fe264c7f584933b629b88eeeedaa4b231ba8 Author: hiromipaw <hiro(a)torproject.org> Date: Tue Apr 4 15:28:11 2017 +0200 Fix title in editor job page --- about/en/jobs-editor.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/jobs-editor.wml b/about/en/jobs-editor.wml index 00c5e49..228e2c4 100644 --- a/about/en/jobs-editor.wml +++ b/about/en/jobs-editor.wml @@ -11,7 +11,7 @@ </div> <div id="maincol"> -<h1>Director of … [View More]

1 0

[webwml/staging] Add editor/writer job ad
by hiro＠torproject.org 04 Apr '17

04 Apr '17

commit 11598192ca97ec4753b00897fbb6c513b67d6a6e Author: hiromipaw <hiro(a)torproject.org> Date: Tue Apr 4 15:20:30 2017 +0200 Add editor/writer job ad --- about/en/jobs-editor.wml | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ about/en/jobs.wml | 38 +++++++++++++--------------- 2 files changed, 83 insertions(+), 21 deletions(-) diff --git a/about/en/jobs-editor.wml b/about/en/jobs-editor.wml new file mode 100644 index 0000000..00c5e49 --- /dev/null +++ b/about/en/… [View More]jobs-editor.wml @@ -0,0 +1,66 @@ +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 3-low + +#include "head.wmi" TITLE="Experienced Writer/Editor Sought for Internet Freedom Nonprofit" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> + <a href="<page about/overview>">About » </a> + <a href="<page about/jobs>">Jobs</a> + </div> + <div id="maincol"> + +<h1>Director of Communications</h1> + + +<p> The Tor Project, Inc., a 501(c)(3) nonprofit organization that provides technical infrastructure for privacy protection over the Internet, is seeking a strong writer/editor to help us tell the world about our important work. The ideal candidate will be familiar with issues involving high tech freedom and can make a compelling case about why our work is so important to current and potential funders. This person must be able to write clearly and provide context for the Tor Project’s complicated technology and activism projects. The ability to explain technical concepts to non-technical audiences is essential.</p> + + +<p>The writer/editor is responsible for researching grant opportunities, sending out letters of inquiry and proposals to foundations, keeping track of dates and deadlines, and submitting reports at the end of the grant periods. The Tor Project consists of six teams that each own multiple sub-projects with different needs and priorities. The writer/editor will need to build a grant proposal pipeline by organizing our ideas and needs into a database that can be accessed as opportunities present themselves while coordinating prioritization with our leadership team.</p> + + +<p>This person is also responsible for additional writing and editing related to other development functions, such as updating the "one-pagers" we distribute at conferences, editing membership emails that go out to our constituents, and writing our annual report. The Tor Project works on Internet freedom issues, and in many ways, our grant proposals and reports are more like activism pieces than traditional pleas for funding, so a background in writing about these issues would be ideal.</p> + +<h2>Qualifications:</h2> + +<ul> + <li>Excellent verbal, written, and editing skills in English; fluency in other languages is a plus.</li> + <li>Comfortable with highly technical topics and ability to explain them clearly and accurately to non-technical audiences.</li> + <li>Knowledge of and appreciation for the free and open source software movement.</li> + <li>Strong generalist understanding of the basic mechanics of how the Internet works, as well as issues related to privacy, security, censorship, and surveillance.</li> + <li>Experience with, or willingness to learn how to use, communications and collaboration technologies such as PGP, IRC, Jitsi, WordPress, and etherpads.</li> + <li>Hard working and highly organized with superior attention to detail.</li> + <li>Highly collaborative with experience working with and as part of remote teams.</li> + <li>Self-starter who thrives on working independently with a dispersed workforce.</li> + <li>Experience working or living outside the United States is a plus.</li> + <li>Fundraising and fundraising communications experience is a plus.</li> + <li>Willingness to travel to international meetings twice a year.</li> + <li>Excellent social skills and a sense of humor.</li> +</ul> + +<p>The ideal candidate will be energetic, unflappable and flexible, and will thrive in a highly-technical collaborative environment.</p> + +<p>The Tor Project's workforce is smart and committed. Experience working with open source communities and/or a dedication to Internet freedom are added pluses. The Tor Project currently has a paid and contract staff of around 25 developers and operational support staff, plus many thousands of volunteers who contribute to our work. The Tor Project is funded in part by government research and development grants, and in part by individual, foundation and corporate donations.</p> + +<p>Flexible salary, depending on experience. The Tor Project has a competitive benefits package, including a generous PTO policy; 13 paid holidays per year (including the week between Christmas and New Year's, when the office is closed); health, vision, dental, disability, and life insurance paid in full for employee; flexible work schedule; and occasional travel opportunities.</p> + +<p>This is a full-time position. The Tor Project’s main office is in Seattle, and we’d be delighted to supply a desk for this position there, however, this job can be done remotely.</p> + +<p>To apply, send a cover letter and your resume to <a href="mailto:hr@torproject.org">hr(a)torproject.org</a> with the subject "Writer/Editor." Tell us why you think you're the right person for this job, and please include links to writing samples. No phone calls please!</p> + +<p>The Tor Project, Inc., is an equal opportunity, affirmative action employer.</p> + + +<p>(Updated 4 April 2017.)</p> + + </div> +  + <div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi> diff --git a/about/en/jobs.wml b/about/en/jobs.wml index a1500db..27266a0 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -12,32 +12,28 @@ <div id="maincol"> <h1>The Tor Project is always looking for more great people to join our team!</h1> - <p>At the moment, we don't have any official open positions. Please check back - soon, though! In the meantime, you may want to glance at our - <a href="<page getinvolved/volunteer>">volunteers</a> page.</p> + #<p>At the moment, we don't have any official open positions. Please check back + #soon, though! In the meantime, you may want to glance at our + #<a href="<page getinvolved/volunteer>">volunteers</a> page.</p> # - #<p>Specifically, we're looking for the following people currently:</p> - #<ul> - #<li><a href="<page about/jobs-comm-director>">Communications Director</a></li> - #<li><a href="<page about/jobs-ooni-ux-designer>">UX Designer - OONI</a></li> - #<li><a href="<page about/jobs-coredev>">Core Developer</a></li> - #<li><a href="<page about/jobs-editor>">Writer/Editor</a></li> - #<li><a href="<page about/jobs-admin-assistant>">Administrative Assistant</a></li> - #</ul> - #</p> + <p>Specifically, we're looking for the following people currently:</p> + <ul> + <li><a href="<page about/jobs-editor>">Writer/Editor</a></li> + </ul> + <p>In the past, we looked for the following people:</p> <ul> - <li>Core developer</li> - <li>Support assistants and translators</li> - <li>Browser hacker</li> - <li>Pluggable transport developer</li> - <li>Lead Automation Engineer</li> - <li>Firefox/Thunderbird Extension Developer</li> - <li>Director of Communications</li> - <li>Executive Director</li> - <li>Executive Administrator</li> + <li>Core developer</li> + <li>Support assistants and translators</li> + <li>Browser hacker</li> + <li>Pluggable transport developer</li> + <li>Lead Automation Engineer</li> + <li>Firefox/Thunderbird Extension Developer</li> + <li>Director of Communications</li> + <li>Executive Director</li> + <li>Executive Administrator</li> </ul> <p> [View Less]

1 0

[webwml/master] Remove tor2web from the website
by hiro＠torproject.org 04 Apr '17

04 Apr '17

commit f0f32c00183e7107fea933ddb7dca626bf050e6d Author: hiromipaw <hiro(a)torproject.org> Date: Tue Apr 4 12:35:39 2017 +0200 Remove tor2web from the website --- getinvolved/en/volunteer.wml | 20 -------------------- projects/en/projects.wml | 11 ----------- projects/en/sidenav.wmi | 3 --- 3 files changed, 34 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 3f70741..b4dc2c8 100644 --- a/getinvolved/en/volunteer.wml +++ b/… [View More]getinvolved/en/volunteer.wml @@ -344,14 +344,6 @@ meetings around the world.</li> </tr> <tr> - <td><a href="#project-tor2web">Tor2web</a></td> - <td>Client Service</td> - <td>Python</td> - <td>Heavy</td> - <td>evilaliv3, hellais</td> - </tr> - - <tr> <td><a href="#project-collector">CollecTor</a></td> <td>Backend Service</td> <td>Java</td> @@ -749,18 +741,6 @@ meetings around the world.</li> has stopped. </p> - <a id="project-tor2web"></a> - <h3><a - href="https://www.tor2web.org">Tor2web</a> (<a - href="https://github.com/globaleaks/tor2web-3.0/wiki">code</a>)</h3> - - <p> - Tor2web allows Internet users to browse websites running in <a - href="<page docs/hidden-services>">Tor hidden services</a>. It trades - user anonymity for usability by allowing anonymous content to be - distributed to non-anonymous users. - </p> - <a id="project-collector"></a> <h3><a href="https://collector.torproject.org/">CollecTor</a> (<a href="https://gitweb.torproject.org/collector.git">code</a>, diff --git a/projects/en/projects.wml b/projects/en/projects.wml index b5b8560..3c42dc8 100644 --- a/projects/en/projects.wml +++ b/projects/en/projects.wml @@ -126,17 +126,6 @@ href="https://trac.torproject.org/projects/tor/wiki/torbirdy">TorBirdy</a></div> </div></div> <div class="projectbox"> -<a href="http://wiki.tor2web.org/"><img src="$(IMGROOT)/tor2web-135x135.png" height="80px" width="80px" alt=""></a> -<div class="projectdesc"><div class="name"><a href="http://wiki.tor2web.org/">Tor2web</a></div> -<p>Tor2web allows Internet users to browse websites running in <a -href="<page docs/hidden-services>">Tor hidden services</a>. It trades user -anonymity for usability by allowing anonymous content to be distributed -to non-anonymous users. -</p> -</div> -</div> - -<div class="projectbox"> <a href="https://txtorcon.readthedocs.org/"><img class="icon" src="$(IMGROOT)/icon-txtorcon.png" alt="txtorcon Icon" width="75" height="75"></a> diff --git a/projects/en/sidenav.wmi b/projects/en/sidenav.wmi index 4be3c78..7473b48 100644 --- a/projects/en/sidenav.wmi +++ b/projects/en/sidenav.wmi @@ -52,9 +52,6 @@ }, {'url' => 'https://shadow.cs.umn.edu/', 'txt' => 'Shadow', - }, - {'url' => 'http://wiki.tor2web.org/', - 'txt' => 'Tor2Web', } ] }]; [View Less]

1 0

[webwml/staging] Remove tor2web from the website
by hiro＠torproject.org 04 Apr '17

04 Apr '17

commit f0f32c00183e7107fea933ddb7dca626bf050e6d Author: hiromipaw <hiro(a)torproject.org> Date: Tue Apr 4 12:35:39 2017 +0200 Remove tor2web from the website --- getinvolved/en/volunteer.wml | 20 -------------------- projects/en/projects.wml | 11 ----------- projects/en/sidenav.wmi | 3 --- 3 files changed, 34 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 3f70741..b4dc2c8 100644 --- a/getinvolved/en/volunteer.wml +++ b/… [View More]getinvolved/en/volunteer.wml @@ -344,14 +344,6 @@ meetings around the world.</li> </tr> <tr> - <td><a href="#project-tor2web">Tor2web</a></td> - <td>Client Service</td> - <td>Python</td> - <td>Heavy</td> - <td>evilaliv3, hellais</td> - </tr> - - <tr> <td><a href="#project-collector">CollecTor</a></td> <td>Backend Service</td> <td>Java</td> @@ -749,18 +741,6 @@ meetings around the world.</li> has stopped. </p> - <a id="project-tor2web"></a> - <h3><a - href="https://www.tor2web.org">Tor2web</a> (<a - href="https://github.com/globaleaks/tor2web-3.0/wiki">code</a>)</h3> - - <p> - Tor2web allows Internet users to browse websites running in <a - href="<page docs/hidden-services>">Tor hidden services</a>. It trades - user anonymity for usability by allowing anonymous content to be - distributed to non-anonymous users. - </p> - <a id="project-collector"></a> <h3><a href="https://collector.torproject.org/">CollecTor</a> (<a href="https://gitweb.torproject.org/collector.git">code</a>, diff --git a/projects/en/projects.wml b/projects/en/projects.wml index b5b8560..3c42dc8 100644 --- a/projects/en/projects.wml +++ b/projects/en/projects.wml @@ -126,17 +126,6 @@ href="https://trac.torproject.org/projects/tor/wiki/torbirdy">TorBirdy</a></div> </div></div> <div class="projectbox"> -<a href="http://wiki.tor2web.org/"><img src="$(IMGROOT)/tor2web-135x135.png" height="80px" width="80px" alt=""></a> -<div class="projectdesc"><div class="name"><a href="http://wiki.tor2web.org/">Tor2web</a></div> -<p>Tor2web allows Internet users to browse websites running in <a -href="<page docs/hidden-services>">Tor hidden services</a>. It trades user -anonymity for usability by allowing anonymous content to be distributed -to non-anonymous users. -</p> -</div> -</div> - -<div class="projectbox"> <a href="https://txtorcon.readthedocs.org/"><img class="icon" src="$(IMGROOT)/icon-txtorcon.png" alt="txtorcon Icon" width="75" height="75"></a> diff --git a/projects/en/sidenav.wmi b/projects/en/sidenav.wmi index 4be3c78..7473b48 100644 --- a/projects/en/sidenav.wmi +++ b/projects/en/sidenav.wmi @@ -52,9 +52,6 @@ }, {'url' => 'https://shadow.cs.umn.edu/', 'txt' => 'Shadow', - }, - {'url' => 'http://wiki.tor2web.org/', - 'txt' => 'Tor2Web', } ] }]; [View Less]

1 0