January 2015 - tor-commits - lists.torproject.org

[tor/master] Increase bandwidth usage report interval to 4 hours.
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit 6830667d58815219476593901334b2e19554d8af Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 22 12:24:13 2014 -0500 Increase bandwidth usage report interval to 4 hours. --- changes/bug13988 | 3 +++ src/or/rephist.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/changes/bug13988 b/changes/bug13988 new file mode 100644 index 0000000..e816335 --- /dev/null +++ b/changes/bug13988 @@ -0,0 +1,3 @@ + o Minor bugfixes (statistics): + - … [View More]

1 0

[tor/master] appease "make check-spaces"
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit 79aaad952f4f43a7057c4162ae378d5bad28a77e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 7 10:09:09 2015 -0500 appease "make check-spaces" --- src/or/circuitbuild.c | 2 +- src/test/test_config.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 0ad026b..9620a23 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2065,7 +2065,7 @@ choose_good_entry_server(uint8_t … [View More]

1 0

[tor/master] Merge branch 'bug9286_v3_squashed'
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit cb54cd6745eaf15716aa357fc253f43f26c051a6 Merge: 49dca8b 7984fc1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 7 10:06:50 2015 -0500 Merge branch 'bug9286_v3_squashed' changes/bug9286 | 4 ++++ src/common/util.c | 23 ++++++++++++++++++----- src/common/util.h | 1 + src/or/rendcommon.c | 6 +++--- src/or/routerparse.c | 10 ++++++++-- src/or/routerparse.h | 3 ++- src/test/test.c | 12 ++++++------ src/test/test_util.c | … [View More]

1 0

[tor/master] Stop accepting milliseconds in various directory contexts
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit 7984fc153112baa5c370215f2205025a7648d7b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 23:45:40 2013 -0400 Stop accepting milliseconds in various directory contexts Have clients and authorities both have new behavior, since the fix for bug 11243 has gone in. But make clients still accept accept old bogus HSDir descriptors, to avoid fingerprinting trickery. Fixes bug 9286. --- changes/bug9286 | 4 ++++ src/common/util.c … [View More] | 23 ++++++++++++++++++----- src/common/util.h | 1 + src/or/rendcommon.c | 6 +++--- src/or/routerparse.c | 10 ++++++++-- src/or/routerparse.h | 3 ++- src/test/test.c | 12 ++++++------ src/test/test_util.c | 16 +++++++++------- 8 files changed, 51 insertions(+), 24 deletions(-) diff --git a/changes/bug9286 b/changes/bug9286 new file mode 100644 index 0000000..062a7a0 --- /dev/null +++ b/changes/bug9286 @@ -0,0 +1,4 @@ + o Minor bugfixes (parsing): + - Stop accepting milliseconds (or other junk) at the end of + descriptor publication times. Fixes bug 9286; bugfix on + 0.0.2pre25. \ No newline at end of file diff --git a/src/common/util.c b/src/common/util.c index 50097da..481f96b 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1656,15 +1656,18 @@ format_iso_time_nospace_usec(char *buf, const struct timeval *tv) /** Given an ISO-formatted UTC time value (after the epoch) in <b>cp</b>, * parse it and store its value in *<b>t</b>. Return 0 on success, -1 on - * failure. Ignore extraneous stuff in <b>cp</b> separated by whitespace from - * the end of the time string. */ + * failure. Ignore extraneous stuff in <b>cp</b> after the end of the time + * string, unless <b>strict</b> is set. */ int -parse_iso_time(const char *cp, time_t *t) +parse_iso_time_(const char *cp, time_t *t, int strict) { struct tm st_tm; unsigned int year=0, month=0, day=0, hour=0, minute=0, second=0; - if (tor_sscanf(cp, "%u-%2u-%2u %2u:%2u:%2u", &year, &month, - &day, &hour, &minute, &second) < 6) { + int n_fields; + char extra_char; + n_fields = tor_sscanf(cp, "%u-%2u-%2u %2u:%2u:%2u%c", &year, &month, + &day, &hour, &minute, &second, &extra_char); + if (strict ? (n_fields != 6) : (n_fields < 6)) { char *esc = esc_for_log(cp); log_warn(LD_GENERAL, "ISO time %s was unparseable", esc); tor_free(esc); @@ -1693,6 +1696,16 @@ parse_iso_time(const char *cp, time_t *t) return tor_timegm(&st_tm, t); } +/** Given an ISO-formatted UTC time value (after the epoch) in <b>cp</b>, + * parse it and store its value in *<b>t</b>. Return 0 on success, -1 on + * failure. Reject the string if any characters are present after the time. + */ +int +parse_iso_time(const char *cp, time_t *t) +{ + return parse_iso_time_(cp, t, 1); +} + /** Given a <b>date</b> in one of the three formats allowed by HTTP (ugh), * parse it into <b>tm</b>. Return 0 on success, negative on failure. */ int diff --git a/src/common/util.h b/src/common/util.h index 921dd79..a3a79a9 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -270,6 +270,7 @@ void format_local_iso_time(char *buf, time_t t); void format_iso_time(char *buf, time_t t); void format_iso_time_nospace(char *buf, time_t t); void format_iso_time_nospace_usec(char *buf, const struct timeval *tv); +int parse_iso_time_(const char *cp, time_t *t, int strict); int parse_iso_time(const char *buf, time_t *t); int parse_http_time(const char *buf, struct tm *tm); int format_time_interval(char *out, size_t out_len, long interval); diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index df74b74..837bd2b 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -411,7 +411,7 @@ rend_desc_v2_is_parsable(rend_encoded_v2_service_descriptor_t *desc) &test_intro_content, &test_intro_size, &test_encoded_size, - &test_next, desc->desc_str); + &test_next, desc->desc_str, 1); rend_service_descriptor_free(test_parsed); tor_free(test_intro_content); return (res >= 0); @@ -945,7 +945,7 @@ rend_cache_store_v2_desc_as_dir(const char *desc) } while (rend_parse_v2_service_descriptor(&parsed, desc_id, &intro_content, &intro_size, &encoded_size, - &next_desc, current_desc) >= 0) { + &next_desc, current_desc, 1) >= 0) { number_parsed++; /* We don't care about the introduction points. */ tor_free(intro_content); @@ -1084,7 +1084,7 @@ rend_cache_store_v2_desc_as_client(const char *desc, /* Parse the descriptor. */ if (rend_parse_v2_service_descriptor(&parsed, desc_id, &intro_content, &intro_size, &encoded_size, - &next_desc, desc) < 0) { + &next_desc, desc, 0) < 0) { log_warn(LD_REND, "Could not parse descriptor."); goto err; } diff --git a/src/or/routerparse.c b/src/or/routerparse.c index bc3b002..a944e35 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4417,6 +4417,9 @@ sort_version_list(smartlist_t *versions, int remove_duplicates) * to *<b>encoded_size_out</b>, and a pointer to the possibly next * descriptor to *<b>next_out</b>; return 0 for success (including validation) * and -1 for failure. + * + * If <b>as_hsdir</b> is 1, we're parsing this as an HSDir, and we should + * be strict about time formats. */ int rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, @@ -4424,7 +4427,8 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, char **intro_points_encrypted_out, size_t *intro_points_encrypted_size_out, size_t *encoded_size_out, - const char **next_out, const char *desc) + const char **next_out, const char *desc, + int as_hsdir) { rend_service_descriptor_t *result = tor_malloc_zero(sizeof(rend_service_descriptor_t)); @@ -4438,6 +4442,8 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, char public_key_hash[DIGEST_LEN]; char test_desc_id[DIGEST_LEN]; memarea_t *area = NULL; + const int strict_time_fmt = as_hsdir; + tor_assert(desc); /* Check if desc starts correctly. */ if (strncmp(desc, "rendezvous-service-descriptor ", @@ -4532,7 +4538,7 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, * descriptor. */ tok = find_by_keyword(tokens, R_PUBLICATION_TIME); tor_assert(tok->n_args == 1); - if (parse_iso_time(tok->args[0], &result->timestamp) < 0) { + if (parse_iso_time_(tok->args[0], &result->timestamp, strict_time_fmt) < 0) { log_warn(LD_REND, "Invalid publication time: '%s'", tok->args[0]); goto err; } diff --git a/src/or/routerparse.h b/src/or/routerparse.h index e950548..6629b6d 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -73,7 +73,8 @@ int rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, char **intro_points_encrypted_out, size_t *intro_points_encrypted_size_out, size_t *encoded_size_out, - const char **next_out, const char *desc); + const char **next_out, const char *desc, + int as_hsdir); int rend_decrypt_introduction_points(char **ipos_decrypted, size_t *ipos_decrypted_size, const char *descriptor_cookie, diff --git a/src/test/test.c b/src/test/test.c index 07901ab..032a9d7 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -696,12 +696,12 @@ test_rend_fns(void *arg) smartlist_get(descs, 0))->desc_id, OP_EQ, computed_desc_id, DIGEST_LEN); tt_assert(rend_parse_v2_service_descriptor(&parsed, parsed_desc_id, - &intro_points_encrypted, - &intro_points_size, - &encoded_size, - &next_desc, - ((rend_encoded_v2_service_descriptor_t *) - smartlist_get(descs, 0))->desc_str) == 0); + &intro_points_encrypted, + &intro_points_size, + &encoded_size, + &next_desc, + ((rend_encoded_v2_service_descriptor_t *) + smartlist_get(descs, 0))->desc_str, 1) == 0); tt_assert(parsed); tt_mem_op(((rend_encoded_v2_service_descriptor_t *) smartlist_get(descs, 0))->desc_id,OP_EQ, parsed_desc_id, DIGEST_LEN); diff --git a/src/test/test_util.c b/src/test/test_util.c index b952bb2..94671f9 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -589,15 +589,17 @@ test_util_time(void *arg) i = parse_iso_time("2004-8-4 0:48:22", &t_res); tt_int_op(0,OP_EQ, i); tt_int_op(t_res,OP_EQ, (time_t)1091580502UL); - tt_int_op(-1,OP_EQ, parse_iso_time("2004-08-zz 99-99x99 GMT", &t_res)); - tt_int_op(-1,OP_EQ, parse_iso_time("2011-03-32 00:00:00 GMT", &t_res)); - tt_int_op(-1,OP_EQ, parse_iso_time("2011-03-30 24:00:00 GMT", &t_res)); - tt_int_op(-1,OP_EQ, parse_iso_time("2011-03-30 23:60:00 GMT", &t_res)); - tt_int_op(-1,OP_EQ, parse_iso_time("2011-03-30 23:59:62 GMT", &t_res)); - tt_int_op(-1,OP_EQ, parse_iso_time("1969-03-30 23:59:59 GMT", &t_res)); - tt_int_op(-1,OP_EQ, parse_iso_time("2011-00-30 23:59:59 GMT", &t_res)); + tt_int_op(-1,OP_EQ, parse_iso_time("2004-08-zz 99-99x99", &t_res)); + tt_int_op(-1,OP_EQ, parse_iso_time("2011-03-32 00:00:00", &t_res)); + tt_int_op(-1,OP_EQ, parse_iso_time("2011-03-30 24:00:00", &t_res)); + tt_int_op(-1,OP_EQ, parse_iso_time("2011-03-30 23:60:00", &t_res)); + tt_int_op(-1,OP_EQ, parse_iso_time("2011-03-30 23:59:62", &t_res)); + tt_int_op(-1,OP_EQ, parse_iso_time("1969-03-30 23:59:59", &t_res)); + tt_int_op(-1,OP_EQ, parse_iso_time("2011-00-30 23:59:59", &t_res)); tt_int_op(-1,OP_EQ, parse_iso_time("2147483647-08-29 14:00:00", &t_res)); tt_int_op(-1,OP_EQ, parse_iso_time("2011-03-30 23:59", &t_res)); + tt_int_op(-1,OP_EQ, parse_iso_time("2004-08-04 00:48:22.100", &t_res)); + tt_int_op(-1,OP_EQ, parse_iso_time("2004-08-04 00:48:22XYZ", &t_res)); /* Test tor_gettimeofday */ [View Less]

1 0

[tor/master] Enlarge the buffer for a line in a bw file
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit 2b9d48791d0b5245e3ccfd267150dfa34541c87c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jan 7 12:43:21 2015 +0100 Enlarge the buffer for a line in a bw file --- changes/bug14125 | 5 +++++ src/or/dirserv.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug14125 b/changes/bug14125 new file mode 100644 index 0000000..fe6821a --- /dev/null +++ b/changes/bug14125 @@ -0,0 +1,5 @@ + o Minor bugfixes (dirauth): + - Enlarge … [View More]

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit 49dca8b1beae9c2dade2c3193fa7f77f5c15d869 Merge: 7c5a455 2b9d487 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 7 07:50:14 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug14125 | 5 +++++ src/or/dirserv.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.5] Enlarge the buffer for a line in a bw file
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit 2b9d48791d0b5245e3ccfd267150dfa34541c87c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jan 7 12:43:21 2015 +0100 Enlarge the buffer for a line in a bw file --- changes/bug14125 | 5 +++++ src/or/dirserv.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug14125 b/changes/bug14125 new file mode 100644 index 0000000..fe6821a --- /dev/null +++ b/changes/bug14125 @@ -0,0 +1,5 @@ + o Minor bugfixes (dirauth): + - Enlarge … [View More]

1 0

[webwml/master] Update Ubuntu distribution codenames
by sebastian＠torproject.org 07 Jan '15

07 Jan '15

commit 7bcc1efd81ae53459c9736978fbcb0a8fcb201d2 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jan 7 12:58:25 2015 +0100 Update Ubuntu distribution codenames patch by dedal0, implements ticket #13847 --- docs/en/debian-vidalia.wml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/en/debian-vidalia.wml b/docs/en/debian-vidalia.wml index 33a6441..5662917 100644 --- a/docs/en/debian-vidalia.wml +++ b/docs/en/debian-vidalia.wml @@ -26,6 +26,12 @@… [View More]

1 0

[webwml/master] Typo fix
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit fa8d5238414705d4533c17cf48bc629b4ed08736 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 22:32:24 2015 -0500 Typo fix --- about/en/jobs-dircomms.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/jobs-dircomms.wml b/about/en/jobs-dircomms.wml index 379ca21..991d739 100644 --- a/about/en/jobs-dircomms.wml +++ b/about/en/jobs-dircomms.wml @@ -22,7 +22,7 @@ critical. The Director of Communications will work closely with a … [View More]

1 0

[webwml/master] Add the Director of Communications posting
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit bc5577ed2718fc9295cc4cd17ca58d993c54bb73 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 21:04:34 2015 -0500 Add the Director of Communications posting --- about/en/jobs-dircomms.wml | 108 ++++++++++++++++++++++++++++++++++++++++++++ about/en/jobs.wml | 1 + 2 files changed, 109 insertions(+) diff --git a/about/en/jobs-dircomms.wml b/about/en/jobs-dircomms.wml new file mode 100644 index 0000000..379ca21 --- /dev/null +++ b/about/en/jobs-… [View More]dircomms.wml @@ -0,0 +1,108 @@ +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 3-low + +#include "head.wmi" TITLE="Tor Project: Jobs (director of communications)" 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 is seeking an accomplished Director of +Communications who has at least 10 years of communications experience, +ideally in an “in-house” leadership role within a complex (number and +variety of constituents) nonprofit entity. The ability to take +knowledge and transform it into powerful messages, and disseminate it +to the right audiences through the best distribution channels is +critical. The Director of Communications will work closely with a +senior peer group within the organization as the communications +partner on a variety of strategic initiatives.</p> + +<h2>Respnsibilities:</h2> + +<ul> +<li>Work with senior management to develop a communications strategy that will support Tor's organizational goals and will address Tor's diverse audiences: funders, hackers, human rights activists, companies, etc. +</li><li> Implement and evaluate the annual communications plan across the network's discrete audiences in collaboration with the Tor Project team and constituents. +</li><li> Identify challenges and emerging issues faced by the organization. Work with leadership team and staff to recognize communications opportunities and solutions, and define and execute appropriate strategies to support them. +</li><li> Train staff and community members on media and coach/prep/debrief them for specific contacts. +</li><li> Serve as communications counselor to Tor Project leadership. +</li><li> Lead the generation of print and online content that engages audience segments and leads to +measurable action. +</li><li> Put communications vehicles in place to create momentum and awareness and to track +progress toward longer term goals. +</li><li> Track and measure the level of engagement within the Tor Project’s network over time. +</li><li> Manage media contacts. +</li></ul> + +<h2>Qualifications:</h2> + +<ul> +<li>Commitment to Tor’s mission to be “the global resource for technology, advocacy, research and education in the ongoing pursuit of freedom of speech, privacy rights, and censorship circumvention.” +</li><li> Extensive experience as a media strategist or political strategist. +</li><li> Highly collaborative style; experience developing and implementing communications strategies. +</li><li> A strong track record as an implementer who thrives on managing a variety of key initiatives +concurrently. +</li><li> Bachelor's degree in journalism, communications, or related field. +</li><li> Minimum 10 years experience in a senior management role. +</li><li> Demonstrated skill and comfort in proactively building relationships with top tier reporters and +editors, and in positioning subject matter with the media to achieve high-impact placements. +</li><li> Demonstrated experience with crisis management, including media crises, and driving more advantageous coverage of the organization, its projects, and its people. +</li><li> Demonstrated ability to take initiative to work on one’s own, as well as in teams. +</li><li> Demonstrated high-level ability to proactively pitch stories to the mainstream press and tech +press. Experience placing and being part of high profile, high pressure media coverage. +</li><li> Experience writing and placing op-eds and editorials in major newspapers. +</li><li> Experience working with and as part of remote teams. Working with these teams requires +empathy, special communications strategies and adept use of special technologies. +</li><li> Excellent social skills and a sense of humor. +</li><li> Comfortable with highly technical topics and ability to explain them clearly and accurately to a +broader and non-technical audience. +</li><li> Experience with collectives or other alternative organizational structures. +</li><li> Demonstrated experience with complex and high profile social media engagement. +</li><li> Deep understanding and ability to support organizational diversity and to maximize the +strengths and advantages of this diversity. +</li><li> Excellent spoken and written English; fluency in other languages within the Tor Project +community is a plus. +</li><li> Outstanding writer/editor. +</li><li> Understanding and support for Tor’s fundraising efforts, working closely with the development +staff. Fundraising and fundraising communications experience is a plus. +</li></ul> + +<h2>How to apply:</h2> +<ul> +<li>Provide a CV and cover letter explaining your background, experience, skills, and other relevant qualifications. Please include links to writing samples. +</li><li> List some people who can tell us more about you. +</li><li>Email the above to jobs(a)torproject.org, specifying the "Director of Communications" position. +</li></ul> + +<h2>About the company:</h2> + +<p>The Tor Project is a US 501(c)(3) non-profit dedicated to +research, development, and education about online anonymity and +privacy. The Tor network's 6000 volunteer relays carry 48 Gbps for +several million daily users, including ordinary citizens who want +protection from identity theft and prying corporations, corporations +who want to look at a competitor's website in private, people around +the world whose Internet connections are censored, and even +governments and law enforcement. Tor has a staff of 30 paid +developers, researchers, and advocates, plus many dozen volunteers who +help out on a daily basis. Tor is funded in part by government +research and development grants, and in part by individual and +corporate donations. </p> + +<p>(Posted 6 January 2015.)</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 b3046d6..f6a0c3a 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -21,6 +21,7 @@ <ul> <li><a href="<page about/jobs-projectmanager>">Project Manager</a></li> +<li><a href="<page about/jobs-dircomms>">Director of Communications</a></li> </ul> <p>In the past, we looked for the following people:</p> [View Less]

1 0