June 2016 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'zlib_coverage_squashed'
by nickm＠torproject.org 19 Jun '16

19 Jun '16

commit 81cfd5c9a1af1641d980d5b985810fdd85681fa7 Merge: b421648 d937b86 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jun 19 12:20:38 2016 -0400 Merge branch 'zlib_coverage_squashed' changes/test_zlib_bombs | 3 ++ changes/zlib_12 | 4 +++ src/common/torgzip.c | 59 ++++++++---------------------------- src/test/test_util.c | 79 +++++++++++++++++++++++++++++++++++++++---------- 4 files changed, 83 insertions(+), 62 deletions(-)

1 0

[tor/master] Mark the unreachable lines in compat_{, p}threads and workqueue
by nickm＠torproject.org 19 Jun '16

19 Jun '16

commit 429d15c5291d9d6668457b7070f8c5fc2c6994e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 8 17:30:22 2016 -0400 Mark the unreachable lines in compat_{,p}threads and workqueue These are all related to failures from functions that either can't fail as we call them, or where we cannot provoke failure. --- src/common/compat_pthreads.c | 30 +++++++++++++++++++++--------- src/common/compat_threads.c | 13 +++++++++++-- src/common/workqueue.c | 17 +++++++++++++++-- 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c index 1b24cc3..c414e10 100644 --- a/src/common/compat_pthreads.c +++ b/src/common/compat_pthreads.c @@ -104,11 +104,13 @@ void tor_mutex_init(tor_mutex_t *mutex) { if (PREDICT_UNLIKELY(!threads_initialized)) - tor_threads_init(); + tor_threads_init(); // LCOV_EXCL_LINE const int err = pthread_mutex_init(&mutex->mutex, &attr_recursive); if (PREDICT_UNLIKELY(err)) { + // LCOV_EXCL_START log_err(LD_GENERAL, "Error %d creating a mutex.", err); - tor_fragile_assert(); + tor_assert_unreached(); + // LCOV_EXCL_STOP } } @@ -118,12 +120,14 @@ void tor_mutex_init_nonrecursive(tor_mutex_t *mutex) { int err; - if (PREDICT_UNLIKELY(!threads_initialized)) - tor_threads_init(); + if (!threads_initialized) + tor_threads_init(); // LCOV_EXCL_LINE err = pthread_mutex_init(&mutex->mutex, NULL); if (PREDICT_UNLIKELY(err)) { + // LCOV_EXCL_START log_err(LD_GENERAL, "Error %d creating a mutex.", err); - tor_fragile_assert(); + tor_assert_unreached(); + // LCOV_EXCL_STOP } } @@ -135,8 +139,10 @@ tor_mutex_acquire(tor_mutex_t *m) tor_assert(m); err = pthread_mutex_lock(&m->mutex); if (PREDICT_UNLIKELY(err)) { + // LCOV_EXCL_START log_err(LD_GENERAL, "Error %d locking a mutex.", err); - tor_fragile_assert(); + tor_assert_unreached(); + // LCOV_EXCL_STOP } } /** Release the lock <b>m</b> so another thread can have it. */ @@ -147,8 +153,10 @@ tor_mutex_release(tor_mutex_t *m) tor_assert(m); err = pthread_mutex_unlock(&m->mutex); if (PREDICT_UNLIKELY(err)) { + // LCOV_EXCL_START log_err(LD_GENERAL, "Error %d unlocking a mutex.", err); - tor_fragile_assert(); + tor_assert_unreached(); + // LCOV_EXCL_STOP } } /** Clean up the mutex <b>m</b> so that it no longer uses any system @@ -161,8 +169,10 @@ tor_mutex_uninit(tor_mutex_t *m) tor_assert(m); err = pthread_mutex_destroy(&m->mutex); if (PREDICT_UNLIKELY(err)) { + // LCOV_EXCL_START log_err(LD_GENERAL, "Error %d destroying a mutex.", err); - tor_fragile_assert(); + tor_assert_unreached(); + // LCOV_EXCL_STOP } } /** Return an integer representing this thread. */ @@ -212,8 +222,10 @@ void tor_cond_uninit(tor_cond_t *cond) { if (pthread_cond_destroy(&cond->cond)) { + // LCOV_EXCL_START log_warn(LD_GENERAL,"Error freeing condition: %s", strerror(errno)); return; + // LCOV_EXCL_STOP } } /** Wait until one of the tor_cond_signal functions is called on <b>cond</b>. @@ -234,7 +246,7 @@ tor_cond_wait(tor_cond_t *cond, tor_mutex_t *mutex, const struct timeval *tv) /* EINTR should be impossible according to POSIX, but POSIX, like the * Pirate's Code, is apparently treated "more like what you'd call * guidelines than actual rules." */ - continue; + continue; // LCOV_EXCL_LINE } return r ? -1 : 0; } diff --git a/src/common/compat_threads.c b/src/common/compat_threads.c index 8f90012..e845018 100644 --- a/src/common/compat_threads.c +++ b/src/common/compat_threads.c @@ -63,8 +63,8 @@ tor_cond_t * tor_cond_new(void) { tor_cond_t *cond = tor_malloc(sizeof(tor_cond_t)); - if (tor_cond_init(cond)<0) - tor_free(cond); + if (BUG(tor_cond_init(cond)<0)) + tor_free(cond); // LCOV_EXCL_LINE return cond; } @@ -242,8 +242,11 @@ alert_sockets_create(alert_sockets_t *socks_out, uint32_t flags) if (socks[0] >= 0) { if (fcntl(socks[0], F_SETFD, FD_CLOEXEC) < 0 || set_socket_nonblocking(socks[0]) < 0) { + // LCOV_EXCL_START -- if eventfd succeeds, fcntl will. + tor_assert_nonfatal_unreached(); close(socks[0]); return -1; + // LCOV_EXCL_STOP } } } @@ -277,9 +280,12 @@ alert_sockets_create(alert_sockets_t *socks_out, uint32_t flags) fcntl(socks[1], F_SETFD, FD_CLOEXEC) < 0 || set_socket_nonblocking(socks[0]) < 0 || set_socket_nonblocking(socks[1]) < 0) { + // LCOV_EXCL_START -- if pipe succeeds, you can fcntl the output + tor_assert_nonfatal_unreached(); close(socks[0]); close(socks[1]); return -1; + // LCOV_EXCL_STOP } socks_out->read_fd = socks[0]; socks_out->write_fd = socks[1]; @@ -294,9 +300,12 @@ alert_sockets_create(alert_sockets_t *socks_out, uint32_t flags) tor_socketpair(AF_UNIX, SOCK_STREAM, 0, socks) == 0) { if (set_socket_nonblocking(socks[0]) < 0 || set_socket_nonblocking(socks[1])) { + // LCOV_EXCL_START -- if socketpair worked, you can make it nonblocking. + tor_assert_nonfatal_unreached(); tor_close_socket(socks[0]); tor_close_socket(socks[1]); return -1; + // LCOV_EXCL_STOP } socks_out->read_fd = socks[0]; socks_out->write_fd = socks[1]; diff --git a/src/common/workqueue.c b/src/common/workqueue.c index 0a38550..48c0cca 100644 --- a/src/common/workqueue.c +++ b/src/common/workqueue.c @@ -262,9 +262,12 @@ workerthread_new(void *state, threadpool_t *pool, replyqueue_t *replyqueue) thr->in_pool = pool; if (spawn_func(worker_thread_main, thr) < 0) { + //LCOV_EXCL_START + tor_assert_nonfatal_unreached(); log_err(LD_GENERAL, "Can't launch worker thread."); tor_free(thr); return NULL; + //LCOV_EXCL_STOP } return thr; @@ -375,8 +378,8 @@ threadpool_queue_update(threadpool_t *pool, static int threadpool_start_threads(threadpool_t *pool, int n) { - if (n < 0) - return -1; + if (BUG(n < 0)) + return -1; // LCOV_EXCL_LINE if (n > MAX_THREADS) n = MAX_THREADS; @@ -391,9 +394,12 @@ threadpool_start_threads(threadpool_t *pool, int n) workerthread_t *thr = workerthread_new(state, pool, pool->reply_queue); if (!thr) { + //LCOV_EXCL_START + tor_assert_nonfatal_unreached(); pool->free_thread_state_fn(state); tor_mutex_release(&pool->lock); return -1; + //LCOV_EXCL_STOP } thr->index = pool->n_threads; pool->threads[pool->n_threads++] = thr; @@ -429,10 +435,13 @@ threadpool_new(int n_threads, pool->reply_queue = replyqueue; if (threadpool_start_threads(pool, n_threads) < 0) { + //LCOV_EXCL_START + tor_assert_nonfatal_unreached(); tor_cond_uninit(&pool->condition); tor_mutex_uninit(&pool->lock); tor_free(pool); return NULL; + //LCOV_EXCL_STOP } return pool; @@ -456,8 +465,10 @@ replyqueue_new(uint32_t alertsocks_flags) rq = tor_malloc_zero(sizeof(replyqueue_t)); if (alert_sockets_create(&rq->alert, alertsocks_flags) < 0) { + //LCOV_EXCL_START tor_free(rq); return NULL; + //LCOV_EXCL_STOP } tor_mutex_init(&rq->lock); @@ -486,10 +497,12 @@ void replyqueue_process(replyqueue_t *queue) { if (queue->alert.drain_fn(queue->alert.read_fd) < 0) { + //LCOV_EXCL_START static ratelim_t warn_limit = RATELIM_INIT(7200); log_fn_ratelim(&warn_limit, LOG_WARN, LD_GENERAL, "Failure from drain_fd: %s", tor_socket_strerror(tor_socket_errno(queue->alert.read_fd))); + //LCOV_EXCL_STOP } tor_mutex_acquire(&queue->lock);

1 0

[tor/master] Add several test scripts wrapping test_workqueue
by nickm＠torproject.org 19 Jun '16

19 Jun '16

commit 3cc374456bc9428fac3ce95203d15ebbe393c09c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 8 17:29:06 2016 -0400 Add several test scripts wrapping test_workqueue This is a fairly easy way for us to get our test coverage up on compat_threads.c and workqueue.c -- I already implemented these tests, so we might as well enable them. --- changes/workqueue_tests | 4 ++++ src/test/include.am | 18 ++++++++++++++++-- src/test/test_workqueue.c | 3 +++ src/test/test_workqueue_cancel.sh | 4 ++++ src/test/test_workqueue_efd.sh | 4 ++++ src/test/test_workqueue_efd2.sh | 4 ++++ src/test/test_workqueue_pipe.sh | 4 ++++ src/test/test_workqueue_pipe2.sh | 4 ++++ src/test/test_workqueue_socketpair.sh | 4 ++++ 9 files changed, 47 insertions(+), 2 deletions(-) diff --git a/changes/workqueue_tests b/changes/workqueue_tests new file mode 100644 index 0000000..7c5d756 --- /dev/null +++ b/changes/workqueue_tests @@ -0,0 +1,4 @@ + o Testing: + - Run more workqueue tests as part of "make check". These had previously + been implemented, but you needed to know special command-line options + to enable them. diff --git a/src/test/include.am b/src/test/include.am index fa660f5..5a91c74 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -9,6 +9,12 @@ TESTS_ENVIRONMENT = \ export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)"; TESTSCRIPTS = src/test/test_zero_length_keys.sh \ + src/test/test_workqueue_cancel.sh \ + src/test/test_workqueue_efd.sh \ + src/test/test_workqueue_efd2.sh \ + src/test/test_workqueue_pipe.sh \ + src/test/test_workqueue_pipe2.sh \ + src/test/test_workqueue_socketpair.sh \ src/test/test_switch_id.sh if USEPYTHON @@ -16,7 +22,8 @@ TESTSCRIPTS += src/test/test_ntor.sh src/test/test_bt.sh endif TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ - src/test/test_workqueue src/test/test_keygen.sh \ + src/test/test_workqueue \ + src/test/test_keygen.sh \ src/test/test-timers \ $(TESTSCRIPTS) @@ -257,4 +264,11 @@ EXTRA_DIST += \ src/test/test_zero_length_keys.sh \ src/test/test_ntor.sh src/test/test_bt.sh \ src/test/test-network.sh \ - src/test/test_switch_id.sh + src/test/test_switch_id.sh \ + src/test/test_workqueue_cancel.sh \ + src/test/test_workqueue_efd.sh \ + src/test/test_workqueue_efd2.sh \ + src/test/test_workqueue_pipe.sh \ + src/test/test_workqueue_pipe2.sh \ + src/test/test_workqueue_socketpair.sh + diff --git a/src/test/test_workqueue.c b/src/test/test_workqueue.c index cbcf596..75d68a7 100644 --- a/src/test/test_workqueue.c +++ b/src/test/test_workqueue.c @@ -400,6 +400,9 @@ main(int argc, char **argv) } rq = replyqueue_new(as_flags); + if (as_flags && rq == NULL) + return 77; // 77 means "skipped". + tor_assert(rq); tp = threadpool_new(opt_n_threads, rq, new_state, free_state, NULL); diff --git a/src/test/test_workqueue_cancel.sh b/src/test/test_workqueue_cancel.sh new file mode 100755 index 0000000..f7c6631 --- /dev/null +++ b/src/test/test_workqueue_cancel.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +${builddir:-.}/src/test/test_workqueue -C 1 + diff --git a/src/test/test_workqueue_efd.sh b/src/test/test_workqueue_efd.sh new file mode 100755 index 0000000..4d89396 --- /dev/null +++ b/src/test/test_workqueue_efd.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +${builddir:-.}/src/test/test_workqueue \ + --no-eventfd2 --no-pipe2 --no-pipe --no-socketpair diff --git a/src/test/test_workqueue_efd2.sh b/src/test/test_workqueue_efd2.sh new file mode 100755 index 0000000..7cfff45 --- /dev/null +++ b/src/test/test_workqueue_efd2.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +${builddir:-.}/src/test/test_workqueue \ + --no-eventfd --no-pipe2 --no-pipe --no-socketpair diff --git a/src/test/test_workqueue_pipe.sh b/src/test/test_workqueue_pipe.sh new file mode 100755 index 0000000..afcef87 --- /dev/null +++ b/src/test/test_workqueue_pipe.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +${builddir:-.}/src/test/test_workqueue \ + --no-eventfd2 --no-eventfd --no-pipe2 --no-socketpair diff --git a/src/test/test_workqueue_pipe2.sh b/src/test/test_workqueue_pipe2.sh new file mode 100755 index 0000000..a20a142 --- /dev/null +++ b/src/test/test_workqueue_pipe2.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +${builddir:-.}/src/test/test_workqueue \ + --no-eventfd2 --no-eventfd --no-pipe --no-socketpair diff --git a/src/test/test_workqueue_socketpair.sh b/src/test/test_workqueue_socketpair.sh new file mode 100755 index 0000000..76af797 --- /dev/null +++ b/src/test/test_workqueue_socketpair.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +${builddir:-.}/src/test/test_workqueue \ + --no-eventfd2 --no-eventfd --no-pipe2 --no-pipe

1 0

[tor/master] Merge remote-tracking branch 'public/thread_coverage'
by nickm＠torproject.org 19 Jun '16

19 Jun '16

commit b421648da2d3e73e0cfd6fd847c3279f64a332cd Merge: 2c96d95 429d15c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jun 19 12:15:55 2016 -0400 Merge remote-tracking branch 'public/thread_coverage' changes/workqueue_tests | 4 ++++ src/common/compat_pthreads.c | 30 +++++++++++++++++++++--------- src/common/compat_threads.c | 13 +++++++++++-- src/common/workqueue.c | 17 +++++++++++++++-- src/test/include.am | 18 ++++++++++++++++-- src/test/test_workqueue.c | 3 +++ src/test/test_workqueue_cancel.sh | 4 ++++ src/test/test_workqueue_efd.sh | 4 ++++ src/test/test_workqueue_efd2.sh | 4 ++++ src/test/test_workqueue_pipe.sh | 4 ++++ src/test/test_workqueue_pipe2.sh | 4 ++++ src/test/test_workqueue_socketpair.sh | 4 ++++ 12 files changed, 94 insertions(+), 15 deletions(-)

1 0

[tor/master] Fix spelling of --enable-tor2web-mode in manpage
by nickm＠torproject.org 19 Jun '16

19 Jun '16

commit 2c96d95c12a8d8678ec5821d83072afe045755ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 19:32:44 2016 -0400 Fix spelling of --enable-tor2web-mode in manpage Fixes bug 19153; patch from "U+039b", who is apparently an uppercase lambda? --- changes/bug19153 | 3 +++ doc/tor.1.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug19153 b/changes/bug19153 new file mode 100644 index 0000000..ac235c5 --- /dev/null +++ b/changes/bug19153 @@ -0,0 +1,3 @@ + o Documentation: + - Fix spelling of "--enable-tor2web-mode" in the manpage. Closes + ticket #19153. Patch from "U+039b". diff --git a/doc/tor.1.txt b/doc/tor.1.txt index fe73c7f..65d3c2d 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1426,7 +1426,7 @@ The following options are useful only for clients (that is, if **non-anonymously**. This option also disables client connections to non-hidden-service hostnames through Tor. It **must only** be used when running a tor2web Hidden Service web proxy. - To enable this option the compile time flag --enable-tor2webmode must be + To enable this option the compile time flag --enable-tor2web-mode must be specified. (Default: 0) [[Tor2webRendezvousPoints]] **Tor2webRendezvousPoints** __node__,__node__,__...__::

1 0

[webwml/staging] Remove references to exit enclaving
by sebastian＠torproject.org 19 Jun '16

19 Jun '16

commit 8a1cf858cd01b3794d381f3e14b933c25cdbb116 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Apr 24 12:48:31 2016 +0200 Remove references to exit enclaving This never worked reliably, with microdescriptors we don't even attempt it anymore. --- docs/en/faq.wml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/docs/en/faq.wml b/docs/en/faq.wml index 2858caf..f98bc11 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -3343,24 +3343,6 @@ diversity, has already gone wrong and you shouldn't be thinking that Tor is the problem.) </p> - <p> - Tor does provide a partial solution in a very specific situation, though. - When you make a connection to a destination that also runs a Tor relay, - Tor will automatically extend your circuit so you exit from that circuit. - So for example if Indymedia ran a Tor relay on the same IP address as - their website, people using Tor to get to the Indymedia website would - automatically exit from their Tor relay, thus getting *better* encryption - and authentication properties than just browsing there the normal way. - </p> - - <p> - We'd like to make it still work even if the service is nearby the Tor - relay but not on the same IP address. But there are a variety of - technical problems we need to overcome first (the main one being "how - does the Tor client learn which relays are associated with which - websites in a decentralized yet non-gamable way?"). - </p> - <hr> <a id="AmITotallyAnonymous"></a>

1 0

[webwml/staging] deb.tpo: update suites, II
by sebastian＠torproject.org 19 Jun '16

19 Jun '16

commit 7e44204f570bfe70774b76aefaff23381cb6ce04 Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Apr 24 09:47:16 2016 +0200 deb.tpo: update suites, II --- docs/en/debian.wml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index 56df62a..5f0581d 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -233,14 +233,14 @@ For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#T <blockquote> I run <select id="distrib" onchange="update()"> -<option value="squeeze">Debian oldoldstable (Squeeze)</option> -<option value="wheezy">Debian oldstable (Wheezy)</option> -<option value="jessie" selected="selected">Debian (Jessie)</option> +<option value="wheezy">Debian oldstable (wheezy)</option> +<option value="jessie" selected="selected">Debian stable (jessie)</option> +<option value="stretch">Debian testing (stretch)</option> <option value="sid">Debian unstable (sid)</option> -<option value="lucid">Ubuntu Lucid Lynx</option> <option value="precise">Ubuntu Precise Pangolin</option> -<option value="saucy">Ubuntu Saucy Salamander</option> <option value="trusty">Ubuntu Trusty Tahr</option> +<option value="wily">Ubuntu Wily Werewolf</option> +<option value="xenial">Ubuntu Xenial Xerus</option> </select> and want <select id="package" onchange="update()"></select>

1 0

[webwml/staging] Remove certificates section from Tor faq
by sebastian＠torproject.org 19 Jun '16

19 Jun '16

commit e3b94dc9a9a7c58fce53520f5b0c7e4cd2c79bec Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Apr 24 12:36:58 2016 +0200 Remove certificates section from Tor faq inspired by #18880 --- docs/en/faq.wml | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/docs/en/faq.wml b/docs/en/faq.wml index 936c317..2858caf 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -41,8 +41,6 @@ proxies?</a></li> from the data my application sends?</a></li> <li><a href="#Metrics">How many people use Tor? How many relays or exit nodes are there?</a></li> - <li><a href="#SSLcertfingerprint">What are your SSL certificate - fingerprints?</a></li> </ul> <p>Compilation and Installation:</p> @@ -893,38 +891,6 @@ executive href="https://metrics.torproject.org/">Tor Metrics Portal</a>.</p> <hr> - <a id="SSLcertfingerprint"></a> - <h3><a class="anchor" href="#SSLcertfingerprint">What are the SSL - certificate fingerprints for Tor's various websites?</a></h3> - <p> - *.torproject.org SSL certificate from Digicert: - </p> - <pre> -Issued Certificate -Version: 3 -Serial Number: 09 48 B1 A9 3B 25 1D 0D B1 05 10 59 E2 C2 68 0A -Not Valid Before: 2013-10-22 -Not Valid After: 2016-05-03 -Certificate Fingerprints -SHA1: 84 24 56 56 8E D7 90 43 47 AA 89 AB 77 7D A4 94 3B A1 A7 D5 -MD5: A4 16 66 80 AE B9 A4 EC AA 88 01 1B 6F B9 EB CB - </pre> -<br> - <p> -blog.torproject.org SSL certificate from RapidSSL: - </p> - <pre> -Issued Certificate -Version: 3 -Serial Number: 05 CA 2A A9 A5 D6 ED 44 C7 2D 88 1A 18 B0 E7 DC -Not Valid Before: 2014-04-09 -Not Valid After: 2017-06-14 -Certificate Fingerprints -SHA1: DE 20 3D 46 FD C3 68 EB BA 40 56 39 F5 FA FD F5 4E 3A 1F 83 -MD5: 8A 8A A2 5E D9 7F 84 4C 8F 00 3B 43 E0 2D E6 4D - </pre> - <hr> - <a id="CompilationAndInstallation"></a> <h2><a class="anchor">Compilation And Installation:</a></h2>

1 0

[webwml/staging] deb.tpo: update suites
by sebastian＠torproject.org 19 Jun '16

19 Jun '16

commit cda1afc3ff6f468dde48590aa509436e5203f597 Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Apr 24 09:45:12 2016 +0200 deb.tpo: update suites --- docs/en/debian.wml | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index a5a97c1..56df62a 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -11,41 +11,48 @@ // the terms of the GNU GPLv2, http://www.gnu.org/licenses/gpl-2.0.html. var sources = {}; var software = { -'tor': { '_stable': { 'squeeze': [ 'squeeze' ], +'tor': { '_stable': { 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'stretch': [ 'stretch' ], 'sid': [ 'sid' ], - 'lucid': [ 'lucid'], 'precise': [ 'precise'], - 'saucy': [ 'saucy'], - 'trusty': [ 'trusty'], }, - 'experimental-0.2.7.x': { 'wheezy': [ 'wheezy' ], + 'trusty': [ 'trusty'], + 'wily': [ 'wily'], + 'xenial': [ 'xenial'], + }, + 'experimental-0.2.8.x': { + 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'stretch': [ 'stretch' ], 'sid': [ 'sid' ], - 'lucid': [ 'lucid'], 'precise': [ 'precise'], - 'saucy': [ 'saucy'], - 'trusty': [ 'trusty'], }, + 'trusty': [ 'trusty'], + 'wily': [ 'wily'], + 'xenial': [ 'xenial'], + }, }, -'tor (from source)': { '_stable': { 'squeeze': [ 'squeeze' ], +'tor (from source)': { + '_stable': { 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'stretch': [ 'stretch' ], 'sid': [ 'sid' ], - 'lucid': [ 'lucid'], 'precise': [ 'precise'], - 'saucy': [ 'saucy'], - 'trusty': [ 'trusty'], }, - 'experimental-0.2.7.x': { 'wheezy': [ 'wheezy' ], + 'trusty': [ 'trusty'], + 'wily': [ 'wily'], + 'xenial': [ 'xenial'], + }, + 'experimental-0.2.8.x': { + 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'stretch': [ 'stretch' ], 'sid': [ 'sid' ], - 'lucid': [ 'lucid'], 'precise': [ 'precise'], - 'saucy': [ 'saucy'], - 'trusty': [ 'trusty'], }, + 'trusty': [ 'trusty'], + 'wily': [ 'wily'], + 'xenial': [ 'xenial'], + }, }, };

1 0

[webwml/staging] Remove filled job positions
by sebastian＠torproject.org 19 Jun '16

19 Jun '16

commit 2294a4c0b9e21dd6cf085db787c7a128c4a97abe Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Apr 24 17:19:21 2016 +0200 Remove filled job positions --- about/en/jobs-admin-assistant.wml | 103 ------------------------------------- about/en/jobs-editor.wml | 72 -------------------------- about/en/jobs-hr.wml | 105 -------------------------------------- about/en/jobs.wml | 22 ++++---- 4 files changed, 11 insertions(+), 291 deletions(-) diff --git a/about/en/jobs-admin-assistant.wml b/about/en/jobs-admin-assistant.wml deleted file mode 100644 index 5d8d50f..0000000 --- a/about/en/jobs-admin-assistant.wml +++ /dev/null @@ -1,103 +0,0 @@ -#include "head.wmi" TITLE="Tor Project: Jobs (Administrative Assistant)" 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>Internet Freedom Nonprofit Seeks Exceptional Administrative -Assistant</h1> -<h2>(Posted 4 Apr 2016)</h2> - -<p> -The Tor Project seeks an organized, conscientious, upbeat -"jack-of-all-trades" with excellent communication skills to support our -Seattle-based executive director and our internationally-distributed -team. The ideal candidate has experience providing executive support and -has a "can do" attitude. This job requires a self-starter who really -enjoys supporting a diverse community of technical people. -</p> - -<p> -The tasks for the position include, but are not limited to: -</p> - -<ul> -<li>Greet people who visit or call our office.</li> -<li>Monitor, order & organize office supplies.</li> -<li>Take the initiative for making office operations run smoothly, such -as opening a FedEx account, hiring a cleaning service, and whatever -other tasks make sense.</li> -<li>Serve as liaison between Seattle office and finance department.</li> -<li>Assist with event planning.</li> -<li>Pick up, drop off and sort mail and packages.</li> -<li>Respond to items in our request tracker (rt).</li> -<li>Log into our accounts on Paypal and Bitcoin to run weekly -reports.</li> -<li>Willingness to learn and use PGP and other computer security -tools.</li> -<li>Willingness to learn and use IRC and other technology-based methods -of communications.</li> -<li>Respond to communications from our donors.</li> -<li>Follow up with event sponsors for travel reimbursement.</li> -<li>Order premiums from vendors.</li> -<li>Fold t-shirts, stuff envelopes, fulfill orders for premiums.</li> -<li>Data entry.</li> -<li>Other duties as needed.</li> - -</ul> - -<p> -The person we seek should have the following qualities: -</p> - -<ul> -<li>Self starter</li> -<li>People person who is always looking for ways to be helpful</li> -<li>Good writing skills</li> -<li>Excellent computer skills</li> -<li>Attention to detail</li> -<li>Sensitivity to computer security issues</li> -<li>Ability to juggle several items at the same time with efficiency and -grace</li> -<li>Ability to work and think independently</li> -<li>Excellent work ethic</li> -<li>Willingness to take the initiative to get things done</li> -<li>Ability to leap tall buildings in a single bound (just -kidding!)</li> -</ul> - -<p> -The Tor Project works on Internet freedom issues, and a commitment to -free speech, privacy and innovation would be helpful. -</p> - -<p> -Salary low- to mid-$40,000s, depending on experience. -</p> - -<p> -This is a full-time position based in our new office in Seattle, WA. -Inquiries about whether this job can be done remotely or part-time will -not be answered. To apply, send a cover letter and your resume to -<a href="mailto:adminjob@torproject.org">adminjob(a)torproject.org</a>. No -phone calls please! -</p> - -<p> -The Tor Project, Inc. is an equal opportunity, affirmative action -employer. -</p> - - </div> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> - diff --git a/about/en/jobs-editor.wml b/about/en/jobs-editor.wml deleted file mode 100644 index bb1612c..0000000 --- a/about/en/jobs-editor.wml +++ /dev/null @@ -1,72 +0,0 @@ -#include "head.wmi" TITLE="Tor Project: Jobs (Writer/Editor)" 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>Experienced Writer/Editor Sought for Internet Freedom Nonprofit</h1> -<h2>(Posted 4 Apr 2016)</h2> - -<p> -The Tor Project is looking for a strong writer/editor who is 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. -</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. 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. In many -ways, the Tor Project's grant proposals and reports are more like -activism pieces than traditional pleas for funding, so a background in -writing about civil liberties issues, such as freedom of speech and -privacy, and/or activism issues would be ideal. Excellent interpersonal, -organizational and written and oral communications skills are essential. -Grant writing experience is helpful but not required. Experience with -technology and using secure communications tools such as PGP, IRC, and -xmpp/otr is a big plus, as the role will engage with a globally -distributed team of security-conscious developers and advocates. -</p> - -<p> -The Tor Project works on Internet freedom issues, and a commitment to -free speech, privacy and innovation would be helpful. -</p> - -<p> -Salary low- to mid-$40,000s, depending on experience. -</p> - -<p> -This is a full-time position working in our new Seattle office. To -apply, please send a cover letter and resume along with two persuasive -writing samples to <a -href="mailto:grantjob@torproject.org">grantjob(a)torproject.org</a>. -Inquiries about whether this job can be done remotely or part-time will -not be answered. No phone calls please. -</p> - -<p> -The Tor Project, Inc. is an equal opportunity, affirmative action -employer. -</p> - - </div> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> - diff --git a/about/en/jobs-hr.wml b/about/en/jobs-hr.wml deleted file mode 100644 index b24ef6a..0000000 --- a/about/en/jobs-hr.wml +++ /dev/null @@ -1,105 +0,0 @@ -#include "head.wmi" TITLE="Tor Project: Jobs (Human Resources Manager)" 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>Internet Freedom Nonprofit Seeks Human Resources Manager</h1> -<h2>(Posted 4 Apr 2016)</h2> - -<p> -The Tor Project is seeking a hands-on Human Resources Manager to support -our Seattle-based executive director and our internationally-distributed -team of technologists and activists fighting to protect freedom around -the world. -</p> - -<p> -Some of the job responsibilities include: -</p> - -<ul> - -<li>Develop and administer the Tor Project's human resource procedures, -including recruitment, hiring, onboarding, and termination.</li> -<li>Develop and implement a culturally-sensitive performance review -process.</li> -<li>Write an employee handbook and ensure that it is kept accurate and -up-to-date.</li> -<li>Administer and improve the Tor Project's employee insurance benefits -programs.</li> -<li>Update and distribute forms and policies related to employee -travel.</li> -<li>Implement a travel service agency procedure for employees who -travel.</li> -<li>Look into offering flexible spending accounts (FSAs) and retirement -benefits.</li> -<li>Track employee personal time off (PTO) hours.</li> -<li>Explore additional things the Tor Project can do to show -appreciation for our employees, contractors and volunteers and help to -retain them.</li> -<li>Review the Tor Project's corporate insurance packages on a yearly -basis to ensure that our coverages are adequate.</li> -</ul> - -<p> -In addition, a successful candidate will have the following -characteristics: -</p> - -<ul> -<li>At least three years of experience in an hr role.</li> -<li>Excellent written and verbal communication skills.</li> -<li>Must scrupulously preserve confidentiality and protect the privacy -of all personnel.</li> -<li>Ability to present information clearly and effectively.</li> -<li>Passion for justice, technology, free speech, privacy, innovation, -and a better digital future worldwide.</li> -<li>Commitment to team-based brainstorming, planning, and -decision-making.</li> -<li>Flexibility to work in an environment where each employee assumes -multiple responsibilities.</li> -<li>Highly resourceful, flexible, entrepreneurial, and with an excellent -work ethic.</li> -<li>Team-focused and willing to assist other departments as needed.</li> -<li>Appreciation of an intellectual, focused, distributed unconventional -and creative office culture.</li> -<li>Eagerness to engage with a diverse, global community utilizing -numerous communication styles, from less formal developers to more -formal external communications.</li> -<li>Comfort level with common open source and encrypted communication -technologies preferred. You will be required to use these tools as part -of your job.</li> -</ul> - -<p> -Salary low- to mid-$60,000s, depending on experience. -</p> - -<p> -If you think you'd like to be part of our team, please send your resume -along with a cover letter explaining why you think you'd be a good fit -to <a href="mailto:hrjob@torproject.org">hrjob(a)torproject.org</a>. This -is a full-time position based in the Tor Project's new office in -Seattle, WA. Inquiries about whether this job can be done remotely or -part-time will not be answered. No phone calls please! -</p> - -<p> -The Tor Project, Inc. is an equal opportunity, affirmative action -employer. -</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 2237509..b859d4d 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -12,18 +12,18 @@ <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>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>Specifically, we're looking for the following people currently: -</p> -<ul> -<li><a href="<page about/jobs-hr>">Human Resources Manager</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-hr>">Human Resources Manager</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>In the past, we looked for the following people:</p>

1 0