- tor-commits - lists.torproject.org

[tor/master] Add "a" line to status document.
by nickm＠torproject.org 19 Jul '12

19 Jul '12

commit dda177b19e614c866d67a02aab1c0a83ca22760d Author: Linus Nordberg <linus(a)nordberg.se> Date: Wed May 9 19:29:46 2012 +0200 Add "a" line to status document. --- src/or/dirserv.c | 17 +++++++++++++++++ src/or/or.h | 2 ++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index ad3c45d..2af4e68 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2088,6 +2088,21 @@ routerstatus_format_entry(char *buf, size_t buf_len, return 0; cp = buf + strlen(buf); + + /* Possible "a" line, not included in consensus for now. */ + if (!tor_addr_is_null(&rs->ipv6_addr)) { + char buf[TOR_ADDR_BUF_LEN]; + r = tor_snprintf(cp, buf_len - (cp-buf), + "a %s:%d\n", + tor_addr_to_str(buf, &rs->ipv6_addr, sizeof(buf), 1), + (int)rs->ipv6_orport); + if (r<0) { + log_warn(LD_BUG, "Not enough space in buffer."); + return -1; + } + cp += strlen(cp); + } + /* NOTE: Whenever this list expands, be sure to increase MAX_FLAG_LINE_LEN*/ r = tor_snprintf(cp, buf_len - (cp-buf), "s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", @@ -2453,6 +2468,8 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs, strlcpy(rs->nickname, ri->nickname, sizeof(rs->nickname)); rs->or_port = ri->or_port; rs->dir_port = ri->dir_port; + tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr); + rs->ipv6_orport = ri->ipv6_orport; } /** Routerstatus rs is part of a group of routers that are on diff --git a/src/or/or.h b/src/or/or.h index 0684b9d..a8ef4d9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1824,6 +1824,8 @@ typedef struct routerstatus_t { uint32_t addr; /**< IPv4 address for this router. */ uint16_t or_port; /**< OR port for this router. */ uint16_t dir_port; /**< Directory port for this router. */ + tor_addr_t ipv6_addr; /**< IPv6 address for this router. */ + uint16_t ipv6_orport; /**<IPV6 OR port for this router. */ unsigned int is_authority:1; /**< True iff this router is an authority. */ unsigned int is_exit:1; /**< True iff this router is a good exit. */ unsigned int is_stable:1; /**< True iff this router stays up a long time. */

1 0

[tor/master] Include IPv6 OR ports in status documents only if we're a bridge authority.
by nickm＠torproject.org 19 Jul '12

19 Jul '12

commit 7c80a4502ce3f0b6d95bf2cee134a89765894b74 Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu May 10 18:48:30 2012 +0200 Include IPv6 OR ports in status documents only if we're a bridge authority. --- src/or/dirserv.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index abbc123..2d9387e 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2468,11 +2468,13 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs, strlcpy(rs->nickname, ri->nickname, sizeof(rs->nickname)); rs->or_port = ri->or_port; rs->dir_port = ri->dir_port; - if (!tor_addr_is_null(&ri->ipv6_addr) && + if (authdir_mode_bridge(options) && + !tor_addr_is_null(&ri->ipv6_addr) && node->last_reachable6 >= now - REACHABLE_TIMEOUT) { - /* There's an IPv6 OR port and it's reachable so copy it to the - routerstatus. FIXME: If we're not on IPv6, copy it regardless - of reachability. */ + /* We're a bridge authority (we're not ready for IPv6 relays in + the consensus quite yet). There's an IPv6 OR port and it's + reachable so copy it to the routerstatus. FIXME: If we're not + on IPv6, copy it regardless of reachability. */ tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr); rs->ipv6_orport = ri->ipv6_orport; }

1 0

[tor/master] Rename routers_have_same_or_addr() to reflect the fact that it now checks both OR ports.
by nickm＠torproject.org 19 Jul '12

19 Jul '12

commit cdef2b181a0a7690736132542fbc5307d5c38955 Author: Linus Nordberg <linus(a)nordberg.se> Date: Fri May 11 10:22:45 2012 +0200 Rename routers_have_same_or_addr() to reflect the fact that it now checks both OR ports. --- src/or/dirserv.c | 2 +- src/or/nodelist.c | 3 +-- src/or/routerlist.c | 2 +- src/or/routerlist.h | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 2d9387e..4d6f93d 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3356,7 +3356,7 @@ dirserv_should_launch_reachability_test(const routerinfo_t *ri, /* It just came out of hibernation; launch a reachability test */ return 1; } - if (! routers_have_same_or_addr(ri, ri_old)) { + if (! routers_have_same_or_addrs(ri, ri_old)) { /* Address or port changed; launch a reachability test */ return 1; } diff --git a/src/or/nodelist.c b/src/or/nodelist.c index cb94173..bbbb9eb 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -135,8 +135,7 @@ nodelist_replace_routerinfo(routerinfo_t *old, routerinfo_t *new) node = node_get_mutable_by_id(old->cache_info.identity_digest); if (node) { tor_assert(node->ri == old); - /* XXXX prop186 we may have more than one address. */ - if (!routers_have_same_or_addr(old, new)) { + if (!routers_have_same_or_addrs(old, new)) { /* These mustn't carry over when the address and orport change. */ node->last_reachable = node->last_reachable6 = 0; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index cc47299..a349a4d 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1343,7 +1343,7 @@ mark_all_trusteddirservers_up(void) /** Return true iff r1 and r2 have the same address and OR port. */ int -routers_have_same_or_addr(const routerinfo_t *r1, const routerinfo_t *r2) +routers_have_same_or_addrs(const routerinfo_t *r1, const routerinfo_t *r2) { return r1->addr == r2->addr && r1->or_port == r2->or_port && tor_addr_eq(&r1->ipv6_addr, &r2->ipv6_addr) && diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 8dcc6eb..e84b040 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -36,7 +36,7 @@ const routerstatus_t *router_pick_trusteddirserver(dirinfo_type_t type, int router_get_my_share_of_directory_requests(double *v2_share_out, double *v3_share_out); void router_reset_status_download_failures(void); -int routers_have_same_or_addr(const routerinfo_t *r1, const routerinfo_t *r2); +int routers_have_same_or_addrs(const routerinfo_t *r1, const routerinfo_t *r2); int router_nickname_is_in_list(const routerinfo_t *router, const char *list); const routerinfo_t *routerlist_find_my_routerinfo(void); const node_t *router_find_exact_exit_enclave(const char *address,

1 0

[tor/master] Don't shadow 'buf'.
by nickm＠torproject.org 19 Jul '12

19 Jul '12

commit dee4f068ee8be3d424aaa300168564f4abd18a36 Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu May 31 18:34:12 2012 +0200 Don't shadow 'buf'. --- src/or/dirserv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 6f16469..7020d5b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2091,10 +2091,10 @@ routerstatus_format_entry(char *buf, size_t buf_len, /* Possible "a" line, not included in consensus for now. */ if (!tor_addr_is_null(&rs->ipv6_addr)) { - char buf[TOR_ADDR_BUF_LEN]; + const char *addr_str = fmt_and_decorate_addr(&rs->ipv6_addr); r = tor_snprintf(cp, buf_len - (cp-buf), "a %s:%d\n", - tor_addr_to_str(buf, &rs->ipv6_addr, sizeof(buf), 1), + addr_str, (int)rs->ipv6_orport); if (r<0) { log_warn(LD_BUG, "Not enough space in buffer.");

1 0

[tor/master] Add configure option AuthDirHasIPv6Connectivity.
by nickm＠torproject.org 19 Jul '12

19 Jul '12

commit 044da1bf0f3bf6299c33d837839ec80ca1966723 Author: Linus Nordberg <linus(a)nordberg.se> Date: Mon May 28 14:41:04 2012 +0200 Add configure option AuthDirHasIPv6Connectivity. Implements enhancement 5974. --- changes/bug5974 | 4 ++++ doc/tor.1.txt | 8 ++++++++ src/or/config.c | 1 + src/or/dirserv.c | 7 ++++--- src/or/or.h | 1 + 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/changes/bug5974 b/changes/bug5974 new file mode 100644 index 0000000..c016be1 --- /dev/null +++ b/changes/bug5974 @@ -0,0 +1,4 @@ + o Minor features: + + - Add new configure option AuthDirHasIPv6Connectivity. Implements + feature #5974. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 78c3487..3cf257c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1728,6 +1728,14 @@ DIRECTORY AUTHORITY SERVER OPTIONS votes on whether to accept relays as hidden service directories. (Default: 1) +**AuthDirHasIPv6Connectivity** **0**|**1**|**auto**:: + + Authoritative directories only. When set to 0, OR ports with an + IPv6 address are being accepted without reachability testing. + When set to 1, IPv6 OR ports are being tested just like IPv4 OR + ports. When set to auto, Tor tries to find out if the authority + relay has IPv6 connectivity or not. (Default: auto) + HIDDEN SERVICE OPTIONS ---------------------- diff --git a/src/or/config.c b/src/or/config.c index bfa8c7f..87c9cc4 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -201,6 +201,7 @@ static config_var_t _option_vars[] = { V(AuthDirListBadExits, BOOL, "0"), V(AuthDirMaxServersPerAddr, UINT, "2"), V(AuthDirMaxServersPerAuthAddr,UINT, "5"), + V(AuthDirHasIPv6Connectivity, AUTOBOOL, "auto"), VAR("AuthoritativeDirectory", BOOL, AuthoritativeDir, "0"), V(AutomapHostsOnResolve, BOOL, "0"), V(AutomapHostsSuffixes, CSV, ".onion,.exit"), diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 4d6f93d..6f16469 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2470,11 +2470,12 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs, rs->dir_port = ri->dir_port; if (authdir_mode_bridge(options) && !tor_addr_is_null(&ri->ipv6_addr) && - node->last_reachable6 >= now - REACHABLE_TIMEOUT) { + (options->AuthDirHasIPv6Connectivity == 0 || + node->last_reachable6 >= now - REACHABLE_TIMEOUT)) { /* We're a bridge authority (we're not ready for IPv6 relays in the consensus quite yet). There's an IPv6 OR port and it's - reachable so copy it to the routerstatus. FIXME: If we're not - on IPv6, copy it regardless of reachability. */ + reachable (or we know that we're not on IPv6) so copy it to the + routerstatus. */ tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr); rs->ipv6_orport = ri->ipv6_orport; } diff --git a/src/or/or.h b/src/or/or.h index a8ef4d9..9474c00 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3273,6 +3273,7 @@ typedef struct { int AuthDirMaxServersPerAuthAddr; /**< Do not permit more than this * number of servers per IP address shared * with an authority. */ + int AuthDirHasIPv6Connectivity; /**< Autoboolean: are we on IPv6? */ /** If non-zero, always vote the Fast flag for any relay advertising * this amount of capacity or more. */

1 0

[tor/master] Add changes file for #5534.
by nickm＠torproject.org 19 Jul '12

19 Jul '12

commit 0fe6dde4b24fde9a63326e6cf9fd71e2247621c7 Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue May 29 09:08:46 2012 +0200 Add changes file for #5534. --- changes/bug5534 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug5534 b/changes/bug5534 new file mode 100644 index 0000000..1518317 --- /dev/null +++ b/changes/bug5534 @@ -0,0 +1,4 @@ + o Major features (IPv6): + Add support for bridge authorities to accept IPv6 bridge addresses + and include them in network status documents. Implements + enhancement 5534.

1 0

[tor/master] Add config option AuthDirPublishIPv6.
by nickm＠torproject.org 19 Jul '12

19 Jul '12

commit fff842a47c7aca7cc8d49ac0e487fa3c6a536c96 Author: Linus Nordberg <linus(a)torproject.org> Date: Thu Jul 19 23:23:22 2012 +0200 Add config option AuthDirPublishIPv6. Test for config option AuthDirPublishIPv6 == 1 rather than for running as a bridge authority when deciding whether to care or not about IPv6 OR ports in descriptors. Implements enhancement #6406. --- changes/enh6406 | 4 ++++ doc/tor.1.txt | 6 ++++++ src/or/config.c | 1 + src/or/dirserv.c | 9 ++++----- src/or/or.h | 1 + 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/changes/enh6406 b/changes/enh6406 new file mode 100644 index 0000000..08349b2 --- /dev/null +++ b/changes/enh6406 @@ -0,0 +1,4 @@ + o Minor features: + + - Add new configure option AuthDirPublishIPv6. Implements + enhancement #6406. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 3cf257c..364bfdc 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1736,6 +1736,12 @@ DIRECTORY AUTHORITY SERVER OPTIONS ports. When set to auto, Tor tries to find out if the authority relay has IPv6 connectivity or not. (Default: auto) +**AuthDirPublishIPv6** **0**|**1**:: + + Authoritative directories only. When set to 0, Tor will not + include IPv6 OR ports in votes. When set to 1, Tor will vote for + IPv6 OR ports. (Default: 0). + HIDDEN SERVICE OPTIONS ---------------------- diff --git a/src/or/config.c b/src/or/config.c index 87c9cc4..1a378c2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -202,6 +202,7 @@ static config_var_t _option_vars[] = { V(AuthDirMaxServersPerAddr, UINT, "2"), V(AuthDirMaxServersPerAuthAddr,UINT, "5"), V(AuthDirHasIPv6Connectivity, AUTOBOOL, "auto"), + V(AuthDirPublishIPv6, BOOL, "0"), VAR("AuthoritativeDirectory", BOOL, AuthoritativeDir, "0"), V(AutomapHostsOnResolve, BOOL, "0"), V(AutomapHostsSuffixes, CSV, ".onion,.exit"), diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 7020d5b..d12ed8a 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2468,14 +2468,13 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs, strlcpy(rs->nickname, ri->nickname, sizeof(rs->nickname)); rs->or_port = ri->or_port; rs->dir_port = ri->dir_port; - if (authdir_mode_bridge(options) && + if (options->AuthDirPublishIPv6 == 1 && !tor_addr_is_null(&ri->ipv6_addr) && (options->AuthDirHasIPv6Connectivity == 0 || node->last_reachable6 >= now - REACHABLE_TIMEOUT)) { - /* We're a bridge authority (we're not ready for IPv6 relays in - the consensus quite yet). There's an IPv6 OR port and it's - reachable (or we know that we're not on IPv6) so copy it to the - routerstatus. */ + /* We're configured for publishing IPv6 OR ports. There's an IPv6 + OR port and it's reachable (or we know that we're not on IPv6) + so copy it to the routerstatus. */ tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr); rs->ipv6_orport = ri->ipv6_orport; } diff --git a/src/or/or.h b/src/or/or.h index 9474c00..b6cffd4 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3274,6 +3274,7 @@ typedef struct { * number of servers per IP address shared * with an authority. */ int AuthDirHasIPv6Connectivity; /**< Autoboolean: are we on IPv6? */ + int AuthDirPublishIPv6; /**< Boolean: should we list IPv6 OR ports? */ /** If non-zero, always vote the Fast flag for any relay advertising * this amount of capacity or more. */

1 0

[tor/master] Try to re-approximate the older semantics of nodelist_add_routerinfo
by nickm＠torproject.org 19 Jul '12

19 Jul '12

commit 6208106c18c696756fe2be8f941992e31aa66a8d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 20:00:19 2012 -0400 Try to re-approximate the older semantics of nodelist_add_routerinfo --- src/or/nodelist.c | 73 ++++++++++++++++++++------------------------------ src/or/nodelist.h | 3 +- src/or/routerlist.c | 8 ++++- 3 files changed, 36 insertions(+), 48 deletions(-) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index bbbb9eb..6ce8dcf 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -115,63 +115,48 @@ node_get_or_create(const char *identity_digest) return node; } -/** Replace old router with new in nodelist. If - * old and new in fact are the same relays (having the - * same identity_digest) the node_t of old is used for - * new. Otherwise the node_t of old is dropped and - * new gets a new one (which might be a recycled node_t in - * case we already have one matching its identity). - */ -node_t * -nodelist_replace_routerinfo(routerinfo_t *old, routerinfo_t *new) -{ - node_t *node = NULL; - tor_assert(old); - tor_assert(new); - - if (tor_memeq(old->cache_info.identity_digest, - new->cache_info.identity_digest, DIGEST_LEN)) { - /* NEW == OLD, reuse node_t. */ - node = node_get_mutable_by_id(old->cache_info.identity_digest); - if (node) { - tor_assert(node->ri == old); - if (!routers_have_same_or_addrs(old, new)) { - /* These mustn't carry over when the address and orport - change. */ - node->last_reachable = node->last_reachable6 = 0; - node->testing_since = node->testing_since6 = 0; - } - } - } else { - /* NEW != OLD, get a new node_t. */ - nodelist_remove_routerinfo(old); - } - node = nodelist_add_routerinfo(node, new); - - return node; +/** Called when a node's address changes. */ +static void +node_addrs_changed(node_t *node) +{ + node->last_reachable = node->last_reachable6 = 0; + node->testing_since = node->testing_since6 = 0; + node->country = -1; } - -/** Add ri to the nodelist. If node_in is not NULL, use - that node rather than creating a new. */ +/** Add ri to an appropriate node in the nodelist. If we replace an + * old routerinfo, and ri_old_out is not NULL, set *ri_old_out + * to the previous routerinfo. + */ node_t * -nodelist_add_routerinfo(node_t *node_in, routerinfo_t *ri) +nodelist_set_routerinfo(routerinfo_t *ri, routerinfo_t **ri_old_out) { - node_t *node = NULL; + node_t *node; + const char *id_digest; + int had_router = 0; + tor_assert(ri); - if (node_in) { - node = node_in; + init_nodelist(); + id_digest = ri->cache_info.identity_digest; + node = node_get_or_create(id_digest); + + if (node->ri) { + if (!routers_have_same_or_addrs(node->ri, ri)) { + node_addrs_changed(node); + } + had_router = 1; + if (ri_old_out) + *ri_old_out = node->ri; } else { - tor_assert(ri); - init_nodelist(); - node = node_get_or_create(ri->cache_info.identity_digest); + if (ri_old_out) + *ri_old_out = NULL; } node->ri = ri; if (node->country == -1) node_set_country(node); - if (authdir_mode(get_options())) { + if (authdir_mode(get_options()) && !had_router) { const char *discard=NULL; uint32_t status = dirserv_router_get_status(ri, &discard); dirserv_set_node_flags_from_authoritative_status(node, status); diff --git a/src/or/nodelist.h b/src/or/nodelist.h index b110fe5..6c1d541 100644 --- a/src/or/nodelist.h +++ b/src/or/nodelist.h @@ -15,8 +15,7 @@ node_t *node_get_mutable_by_id(const char *identity_digest); const node_t *node_get_by_id(const char *identity_digest); const node_t *node_get_by_hex_id(const char *identity_digest); -node_t *nodelist_replace_routerinfo(routerinfo_t *old, routerinfo_t *new); -node_t *nodelist_add_routerinfo(node_t *node, routerinfo_t *ri); +node_t *nodelist_set_routerinfo(routerinfo_t *ri, routerinfo_t **ri_old_out); node_t *nodelist_add_microdesc(microdesc_t *md); void nodelist_set_consensus(networkstatus_t *ns); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index a349a4d..c96a726 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2877,7 +2877,7 @@ routerlist_insert(routerlist_t *rl, routerinfo_t *ri) &ri->cache_info); smartlist_add(rl->routers, ri); ri->cache_info.routerlist_index = smartlist_len(rl->routers) - 1; - nodelist_add_routerinfo(NULL, ri); + nodelist_set_routerinfo(ri, NULL); router_dir_info_changed(); #ifdef DEBUG_ROUTERLIST routerlist_assert_ok(rl); @@ -3106,7 +3106,11 @@ routerlist_replace(routerlist_t *rl, routerinfo_t *ri_old, tor_assert(0 <= idx && idx < smartlist_len(rl->routers)); tor_assert(smartlist_get(rl->routers, idx) == ri_old); - nodelist_replace_routerinfo(ri_old, ri_new); + { + routerinfo_t *ri_old_tmp=NULL; + nodelist_set_routerinfo(ri_new, &ri_old_tmp); + tor_assert(ri_old == ri_old_tmp); + } router_dir_info_changed(); if (idx >= 0) {

1 0

[tor/master] Merge branch 'tickets_5529_5534_5974_6406'
by nickm＠torproject.org 19 Jul '12

19 Jul '12

1 0

r25721: {website} More accurately describe start time (I hope). Also, if peopl (website/trunk/about/en)
by Mike Perry 19 Jul '12

19 Jul '12

Author: mikeperry Date: 2012-07-19 21:12:15 +0000 (Thu, 19 Jul 2012) New Revision: 25721 Modified: website/trunk/about/en/jobs-browserhacker.wml Log: More accurately describe start time (I hope). Also, if people want to avoid mad Google juice for their name and salary in our tax returns, this is neither legally nor technically required of them as contractors. (Which is what the job post claims to be for). Finally, if Steve Jobs gets to demand Insanely Great, I get to demand Insanely Creative. Modified: website/trunk/about/en/jobs-browserhacker.wml =================================================================== --- website/trunk/about/en/jobs-browserhacker.wml 2012-07-19 18:30:37 UTC (rev 25720) +++ website/trunk/about/en/jobs-browserhacker.wml 2012-07-19 21:12:15 UTC (rev 25721) @@ -13,11 +13,11 @@ <h1>The Tor Project is looking for a Browser Hacker!</h1> -Your job would be to work on Torbutton and patches to our Firefox-based -browser, as well as a potential Android port. This would be a contractor -position for the remainder of 2012 plus Q1 2013 (starting as soon -as you're ready and with plenty of work to keep you busy), with the -possibility of later in 2013 and beyond. +Your job would be to work on Torbutton and patches to our +Firefox-based browser, as well as a potential Android port. This would +be a contractor position likely starting in October and going through +Q1 2013, with the possibility of later in 2013 and beyond. There may +also be a possibility for part-time work prior to October. @@ -52,7 +52,8 @@ from either group.</li> <li>Be comfortable with transparency: as a non-profit, everything we do is in -public, including your name and pay rate.</li> +public, including your name (or at least your business name) and pay +rate.</li> </ul> @@ -71,7 +72,8 @@ <li>Already be familiar with compiling software for the Android platform.</li> -<li>Be capable of creative yet also ruthlessly pragmatic thinking.</li> +<li>Be capable of insanely creative yet also ruthlessly pragmatic +thinking.</li> <li>Be familiar with probability, statistics, and information theory.</li>

1 0