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

[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-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>

1 0

[tor/master] Spelling -- readyness->readiness.
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit 7c5a45575fd7881dbb0c16895608775b44c87f01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 17:10:27 2015 -0500 Spelling -- readyness->readiness. --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c index 44469eb..c925b7d 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2081,7 +2081,7 @@ do_main_loop(void) #endif #ifdef HAVE_SYSTEMD - log_notice(LD_GENERAL, "Signaling readyness to systemd"); + log_notice(LD_GENERAL, "Signaling readiness to systemd"); sd_notify(0, "READY=1"); #endif

1 0

[tor/master] Fix obsolete usage of test_{str_}, eq macros
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit 108808e98ebc76bb8859dcaba213ae3e614e7488 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 15:25:20 2015 -0500 Fix obsolete usage of test_{str_},eq macros --- src/test/test_dir.c | 70 +++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 9da44ed..c6594f8 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -845,41 +845,41 @@ test_dir_versions(void *arg) tt_int_op(VER_RELEASE,OP_EQ, ver1.status); tt_str_op("",OP_EQ, ver1.status_tag); - test_eq(0, tor_version_parse("10.1", &ver1)); - test_eq(10, ver1.major); - test_eq(1, ver1.minor); - test_eq(0, ver1.micro); - test_eq(0, ver1.patchlevel); - test_eq(VER_RELEASE, ver1.status); - test_streq("", ver1.status_tag); - test_eq(0, tor_version_parse("5.99.999", &ver1)); - test_eq(5, ver1.major); - test_eq(99, ver1.minor); - test_eq(999, ver1.micro); - test_eq(0, ver1.patchlevel); - test_eq(VER_RELEASE, ver1.status); - test_streq("", ver1.status_tag); - test_eq(0, tor_version_parse("10.1-alpha", &ver1)); - test_eq(10, ver1.major); - test_eq(1, ver1.minor); - test_eq(0, ver1.micro); - test_eq(0, ver1.patchlevel); - test_eq(VER_RELEASE, ver1.status); - test_streq("alpha", ver1.status_tag); - test_eq(0, tor_version_parse("2.1.700-alpha", &ver1)); - test_eq(2, ver1.major); - test_eq(1, ver1.minor); - test_eq(700, ver1.micro); - test_eq(0, ver1.patchlevel); - test_eq(VER_RELEASE, ver1.status); - test_streq("alpha", ver1.status_tag); - test_eq(0, tor_version_parse("1.6.8-alpha-dev", &ver1)); - test_eq(1, ver1.major); - test_eq(6, ver1.minor); - test_eq(8, ver1.micro); - test_eq(0, ver1.patchlevel); - test_eq(VER_RELEASE, ver1.status); - test_streq("alpha-dev", ver1.status_tag); + tt_int_op(0, OP_EQ, tor_version_parse("10.1", &ver1)); + tt_int_op(10, OP_EQ, ver1.major); + tt_int_op(1, OP_EQ, ver1.minor); + tt_int_op(0, OP_EQ, ver1.micro); + tt_int_op(0, OP_EQ, ver1.patchlevel); + tt_int_op(VER_RELEASE, OP_EQ, ver1.status); + tt_str_op("", OP_EQ, ver1.status_tag); + tt_int_op(0, OP_EQ, tor_version_parse("5.99.999", &ver1)); + tt_int_op(5, OP_EQ, ver1.major); + tt_int_op(99, OP_EQ, ver1.minor); + tt_int_op(999, OP_EQ, ver1.micro); + tt_int_op(0, OP_EQ, ver1.patchlevel); + tt_int_op(VER_RELEASE, OP_EQ, ver1.status); + tt_str_op("", OP_EQ, ver1.status_tag); + tt_int_op(0, OP_EQ, tor_version_parse("10.1-alpha", &ver1)); + tt_int_op(10, OP_EQ, ver1.major); + tt_int_op(1, OP_EQ, ver1.minor); + tt_int_op(0, OP_EQ, ver1.micro); + tt_int_op(0, OP_EQ, ver1.patchlevel); + tt_int_op(VER_RELEASE, OP_EQ, ver1.status); + tt_str_op("alpha", OP_EQ, ver1.status_tag); + tt_int_op(0, OP_EQ, tor_version_parse("2.1.700-alpha", &ver1)); + tt_int_op(2, OP_EQ, ver1.major); + tt_int_op(1, OP_EQ, ver1.minor); + tt_int_op(700, OP_EQ, ver1.micro); + tt_int_op(0, OP_EQ, ver1.patchlevel); + tt_int_op(VER_RELEASE, OP_EQ, ver1.status); + tt_str_op("alpha", OP_EQ, ver1.status_tag); + tt_int_op(0, OP_EQ, tor_version_parse("1.6.8-alpha-dev", &ver1)); + tt_int_op(1, OP_EQ, ver1.major); + tt_int_op(6, OP_EQ, ver1.minor); + tt_int_op(8, OP_EQ, ver1.micro); + tt_int_op(0, OP_EQ, ver1.patchlevel); + tt_int_op(VER_RELEASE, OP_EQ, ver1.status); + tt_str_op("alpha-dev", OP_EQ, ver1.status_tag); #define tt_versionstatus_op(vs1, op, vs2) \ tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t, \

1 0

[tor/master] Merge remote-tracking branch 'public/bug13661_025'
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit ae9efa863e3cfcdf38a5b4e36570df9effe68dfd Merge: 90b9e23 fc62721 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 15:16:28 2015 -0500 Merge remote-tracking branch 'public/bug13661_025' changes/bug13661 | 6 +++++ src/or/routerparse.c | 62 +++++++++++++++++++++++++++++--------------------- src/test/test_dir.c | 36 +++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 26 deletions(-) diff --cc src/test/test_dir.c index 6993389,61484f5..9da44ed --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@@ -805,46 -298,81 +805,82 @@@ test_dir_versions(void *arg tor_version_t ver1; /* Try out version parsing functionality */ - test_eq(0, tor_version_parse("0.3.4pre2-cvs", &ver1)); - test_eq(0, ver1.major); - test_eq(3, ver1.minor); - test_eq(4, ver1.micro); - test_eq(VER_PRE, ver1.status); - test_eq(2, ver1.patchlevel); - test_eq(0, tor_version_parse("0.3.4rc1", &ver1)); - test_eq(0, ver1.major); - test_eq(3, ver1.minor); - test_eq(4, ver1.micro); - test_eq(VER_RC, ver1.status); - test_eq(1, ver1.patchlevel); - test_eq(0, tor_version_parse("1.3.4", &ver1)); - test_eq(1, ver1.major); - test_eq(3, ver1.minor); - test_eq(4, ver1.micro); - test_eq(VER_RELEASE, ver1.status); - test_eq(0, ver1.patchlevel); - test_eq(0, tor_version_parse("1.3.4.999", &ver1)); - test_eq(1, ver1.major); - test_eq(3, ver1.minor); - test_eq(4, ver1.micro); - test_eq(VER_RELEASE, ver1.status); - test_eq(999, ver1.patchlevel); - test_eq(0, tor_version_parse("0.1.2.4-alpha", &ver1)); - test_eq(0, ver1.major); - test_eq(1, ver1.minor); - test_eq(2, ver1.micro); - test_eq(4, ver1.patchlevel); - test_eq(VER_RELEASE, ver1.status); - test_streq("alpha", ver1.status_tag); - test_eq(0, tor_version_parse("0.1.2.4", &ver1)); - test_eq(0, ver1.major); - test_eq(1, ver1.minor); - test_eq(2, ver1.micro); - test_eq(4, ver1.patchlevel); - test_eq(VER_RELEASE, ver1.status); - test_streq("", ver1.status_tag); + (void)arg; + tt_int_op(0,OP_EQ, tor_version_parse("0.3.4pre2-cvs", &ver1)); + tt_int_op(0,OP_EQ, ver1.major); + tt_int_op(3,OP_EQ, ver1.minor); + tt_int_op(4,OP_EQ, ver1.micro); + tt_int_op(VER_PRE,OP_EQ, ver1.status); + tt_int_op(2,OP_EQ, ver1.patchlevel); + tt_int_op(0,OP_EQ, tor_version_parse("0.3.4rc1", &ver1)); + tt_int_op(0,OP_EQ, ver1.major); + tt_int_op(3,OP_EQ, ver1.minor); + tt_int_op(4,OP_EQ, ver1.micro); + tt_int_op(VER_RC,OP_EQ, ver1.status); + tt_int_op(1,OP_EQ, ver1.patchlevel); + tt_int_op(0,OP_EQ, tor_version_parse("1.3.4", &ver1)); + tt_int_op(1,OP_EQ, ver1.major); + tt_int_op(3,OP_EQ, ver1.minor); + tt_int_op(4,OP_EQ, ver1.micro); + tt_int_op(VER_RELEASE,OP_EQ, ver1.status); + tt_int_op(0,OP_EQ, ver1.patchlevel); + tt_int_op(0,OP_EQ, tor_version_parse("1.3.4.999", &ver1)); + tt_int_op(1,OP_EQ, ver1.major); + tt_int_op(3,OP_EQ, ver1.minor); + tt_int_op(4,OP_EQ, ver1.micro); + tt_int_op(VER_RELEASE,OP_EQ, ver1.status); + tt_int_op(999,OP_EQ, ver1.patchlevel); + tt_int_op(0,OP_EQ, tor_version_parse("0.1.2.4-alpha", &ver1)); + tt_int_op(0,OP_EQ, ver1.major); + tt_int_op(1,OP_EQ, ver1.minor); + tt_int_op(2,OP_EQ, ver1.micro); + tt_int_op(4,OP_EQ, ver1.patchlevel); + tt_int_op(VER_RELEASE,OP_EQ, ver1.status); + tt_str_op("alpha",OP_EQ, ver1.status_tag); + tt_int_op(0,OP_EQ, tor_version_parse("0.1.2.4", &ver1)); + tt_int_op(0,OP_EQ, ver1.major); + tt_int_op(1,OP_EQ, ver1.minor); + tt_int_op(2,OP_EQ, ver1.micro); + tt_int_op(4,OP_EQ, ver1.patchlevel); + tt_int_op(VER_RELEASE,OP_EQ, ver1.status); + tt_str_op("",OP_EQ, ver1.status_tag); + test_eq(0, tor_version_parse("10.1", &ver1)); + test_eq(10, ver1.major); + test_eq(1, ver1.minor); + test_eq(0, ver1.micro); + test_eq(0, ver1.patchlevel); + test_eq(VER_RELEASE, ver1.status); + test_streq("", ver1.status_tag); + test_eq(0, tor_version_parse("5.99.999", &ver1)); + test_eq(5, ver1.major); + test_eq(99, ver1.minor); + test_eq(999, ver1.micro); + test_eq(0, ver1.patchlevel); + test_eq(VER_RELEASE, ver1.status); + test_streq("", ver1.status_tag); + test_eq(0, tor_version_parse("10.1-alpha", &ver1)); + test_eq(10, ver1.major); + test_eq(1, ver1.minor); + test_eq(0, ver1.micro); + test_eq(0, ver1.patchlevel); + test_eq(VER_RELEASE, ver1.status); + test_streq("alpha", ver1.status_tag); + test_eq(0, tor_version_parse("2.1.700-alpha", &ver1)); + test_eq(2, ver1.major); + test_eq(1, ver1.minor); + test_eq(700, ver1.micro); + test_eq(0, ver1.patchlevel); + test_eq(VER_RELEASE, ver1.status); + test_streq("alpha", ver1.status_tag); + test_eq(0, tor_version_parse("1.6.8-alpha-dev", &ver1)); + test_eq(1, ver1.major); + test_eq(6, ver1.minor); + test_eq(8, ver1.micro); + test_eq(0, ver1.patchlevel); + test_eq(VER_RELEASE, ver1.status); + test_streq("alpha-dev", ver1.status_tag); + #define tt_versionstatus_op(vs1, op, vs2) \ tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t, \ (val1_ op val2_),"%d",TT_EXIT_TEST_FUNCTION)

1 0

[tor/master] changes file for 10067
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit d87143f3199fe6be6e0a4907e82b25727622c857 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 13 10:50:37 2014 -0500 changes file for 10067 --- changes/feature10067 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/changes/feature10067 b/changes/feature10067 new file mode 100644 index 0000000..3a387d0 --- /dev/null +++ b/changes/feature10067 @@ -0,0 +1,12 @@ + o Major features (changed defaults): + - Prevent relay operators from unintentionally running exits: When + a relay is configured as an exit node, we now warn the user + unless the 'ExitRelay' option is set to 1. We warn even more + loudly if the relay is configured with the default exit policy, + since this tends to indicate accidental misconfiguration. + Setting 'ExitRelay' to 0 stops Tor from running as an exit relay. + Closes ticket 10067. + + o Removed features: + - To avoid confusion with the 'ExitRelay' option, 'ExitNode' is no + longer silently accepted as an alias for 'ExitNodes'.

1 0

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

06 Jan '15

commit 90b9e23bec4687962a999c2575909b9230bd425a Merge: 3401c34 d87143f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 15:15:18 2015 -0500 Merge branch 'exitnode_10067_squashed' Conflicts: src/or/or.h changes/feature10067 | 12 ++++++++++++ doc/tor.1.txt | 13 +++++++++++++ src/or/config.c | 3 ++- src/or/or.h | 8 ++++++++ src/or/policies.c | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 71 insertions(+), 1 deletion(-) diff --cc src/or/or.h index c0ecadc,dadf556..58e2164 --- a/src/or/or.h +++ b/src/or/or.h @@@ -4259,18 -4229,16 +4259,26 @@@ typedef struct /** How long (seconds) do we keep a guard before picking a new one? */ int GuardLifetime; - /** Should we send the timestamps that pre-023 hidden services want? */ - int Support022HiddenServices; + /** Low-water mark for global scheduler - start sending when estimated + * queued size falls below this threshold. + */ + uint64_t SchedulerLowWaterMark__; + /** High-water mark for global scheduler - stop sending when estimated + * queued size exceeds this threshold. + */ + uint64_t SchedulerHighWaterMark__; + /** Flush size for global scheduler - flush this many cells at a time + * when sending. + */ + int SchedulerMaxFlushCells__; + + /** Is this an exit node? This is a tristate, where "1" means "yes, and use + * the default exit policy if none is given" and "0" means "no; exit policy + * is 'reject *'" and "auto" (-1) means "same as 1, but warn the user." + * + * XXXX Eventually, the default will be 0. */ + int ExitRelay; + } or_options_t; /** Persistent state for an onion router, as saved to disk. */

1 0

[tor/master] Add an ExitRelay option to override ExitPolicy
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit 35efce1f3f517871aaa19d60976a9abb3a67bede Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 13 10:48:15 2014 -0500 Add an ExitRelay option to override ExitPolicy If we're not a relay, we ignore it. If it's set to 1, we obey ExitPolicy. If it's set to 0, we force ExitPolicy to 'reject *:*' And if it's set to auto, then we warn the user if they're running an exit, and tell them how they can stop running an exit if they didn't mean to do that. Fixes ticket 10067 --- doc/tor.1.txt | 13 +++++++++++++ src/or/config.c | 3 ++- src/or/or.h | 7 +++++++ src/or/policies.c | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index eb406e7..1aa0314 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1479,6 +1479,19 @@ is non-zero): that it's an email address and/or generate a new address for this purpose. +[[ExitRelay]] **ExitRelay** **0**|**1**|**auto**:: + Tells Tor whether to run as an exit relay. If Tor is running as a + non-bridge server, and ExitRelay is set to 1, then Tor allows traffic to + exit according to the ExitPolicy option (or the default ExitPolicy if + none is specified). + + + If ExitRelay is set to 0, no traffic is allowed to + exit, and the ExitPolicy option is ignored. + + + + If ExitRelay is set to "auto", then Tor behaves as if it were set to 1, but + warns the user if this would cause traffic to exit. In a future version, + the default value will be 0. (Default: auto) + [[ExitPolicy]] **ExitPolicy** __policy__,__policy__,__...__:: Set an exit policy for this server. Each policy is of the form "**accept**|**reject** __ADDR__[/__MASK__][:__PORT__]". If /__MASK__ is diff --git a/src/or/config.c b/src/or/config.c index 4b8c683..fd60d13 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -63,7 +63,6 @@ static config_abbrev_t option_abbrevs_[] = { PLURAL(AuthDirBadExitCC), PLURAL(AuthDirInvalidCC), PLURAL(AuthDirRejectCC), - PLURAL(ExitNode), PLURAL(EntryNode), PLURAL(ExcludeNode), PLURAL(FirewallPort), @@ -227,6 +226,7 @@ static config_var_t option_vars_[] = { V(ExitPolicyRejectPrivate, BOOL, "1"), V(ExitPortStatistics, BOOL, "0"), V(ExtendAllowPrivateAddresses, BOOL, "0"), + V(ExitRelay, AUTOBOOL, "auto"), VPORT(ExtORPort, LINELIST, NULL), V(ExtORPortCookieAuthFile, STRING, NULL), V(ExtORPortCookieAuthFileGroupReadable, BOOL, "0"), @@ -3797,6 +3797,7 @@ options_transition_affects_descriptor(const or_options_t *old_options, !opt_streq(old_options->Nickname,new_options->Nickname) || !opt_streq(old_options->Address,new_options->Address) || !config_lines_eq(old_options->ExitPolicy,new_options->ExitPolicy) || + old_options->ExitRelay != new_options->ExitRelay || old_options->ExitPolicyRejectPrivate != new_options->ExitPolicyRejectPrivate || old_options->IPv6Exit != new_options->IPv6Exit || diff --git a/src/or/or.h b/src/or/or.h index 5ebe7bf..dadf556 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4232,6 +4232,13 @@ typedef struct { /** Should we send the timestamps that pre-023 hidden services want? */ int Support022HiddenServices; + /** Is this an exit node? This is a tristate, where "1" means "yes, and use + * the default exit policy if none is given" and "0" means "no; exit policy + * is 'reject *'" and "auto" (-1) means "same as 1, but warn the user." + * + * XXXX Eventually, the default will be 0. */ + int ExitRelay; + } or_options_t; /** Persistent state for an onion router, as saved to disk. */ diff --git a/src/or/policies.c b/src/or/policies.c index d10bebd..dc1a8a3 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -434,6 +434,33 @@ validate_addr_policies(const or_options_t *options, char **msg) REJECT("Error in ExitPolicy entry."); } + static int warned_about_exitrelay = 0; + + const int exitrelay_setting_is_auto = options->ExitRelay == -1; + const int policy_accepts_something = + ! (policy_is_reject_star(addr_policy, AF_INET) && + policy_is_reject_star(addr_policy, AF_INET6)); + + if (server_mode(options) && + ! warned_about_exitrelay && + exitrelay_setting_is_auto && + policy_accepts_something) { + /* Policy accepts something */ + warned_about_exitrelay = 1; + log_warn(LD_CONFIG, + "Tor is running as an exit relay%s. If you did not want this " + "behavior, please set the ExitRelay option to 0. If you do " + "want to run an exit Relay, please set the ExitRelay option " + "to 1 to disable this warning, and for forward compatibility.", + options->ExitPolicy == NULL ? + " with the default exit policy" : ""); + if (options->ExitPolicy == NULL) { + log_warn(LD_CONFIG, + "In a future version of Tor, ExitRelay 0 may become the " + "default when no ExitPolicy is given."); + } + } + /* The rest of these calls *append* to addr_policy. So don't actually * use the results for anything other than checking if they parse! */ if (parse_addr_policy(options->DirPolicy, &addr_policy, -1)) @@ -1022,6 +1049,9 @@ policies_parse_exit_policy(config_line_t *cfg, smartlist_t **dest, * * If <b>or_options->BridgeRelay</b> is false, add entries of default * Tor exit policy into <b>result</b> smartlist. + * + * If or_options->ExitRelay is false, then make our exit policy into + * "reject *:*" regardless. */ int policies_parse_exit_policy_from_options(const or_options_t *or_options, @@ -1030,6 +1060,12 @@ policies_parse_exit_policy_from_options(const or_options_t *or_options, { exit_policy_parser_cfg_t parser_cfg = 0; + if (or_options->ExitRelay == 0) { + append_exit_policy_string(result, "reject *4:*"); + append_exit_policy_string(result, "reject *6:*"); + return 0; + } + if (or_options->IPv6Exit) { parser_cfg |= EXIT_POLICY_IPV6_ENABLED; }

1 0

[tor/master] Fix version number parsing to allow 2- and 3-part versions.
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit fc62721b06e3ac231b570741e21dba03b5cadaca Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 5 13:28:29 2014 -0500 Fix version number parsing to allow 2- and 3-part versions. Fixes bug 13661; bugfix on 0.0.8pre1. --- changes/bug13661 | 6 +++++ src/or/routerparse.c | 62 +++++++++++++++++++++++++++++--------------------- src/test/test_dir.c | 36 +++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 26 deletions(-) diff --git a/changes/bug13661 b/changes/bug13661 new file mode 100644 index 0000000..7f0cb5e --- /dev/null +++ b/changes/bug13661 @@ -0,0 +1,6 @@ + o Minor bugfixes: + + - Support two-number and three-number version numbers correctly, in + case we change the Tor versioning system in the future. Fixes bug + 13661; bugfix on 0.0.8pre1. + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index f990ceb..68dbc70 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4207,40 +4207,50 @@ tor_version_parse(const char *s, tor_version_t *out) char *eos=NULL; const char *cp=NULL; /* Format is: - * "Tor " ? NUM dot NUM dot NUM [ ( pre | rc | dot ) NUM [ - tag ] ] + * "Tor " ? NUM dot NUM [ dot NUM [ ( pre | rc | dot ) NUM ] ] [ - tag ] */ tor_assert(s); tor_assert(out); memset(out, 0, sizeof(tor_version_t)); - + out->status = VER_RELEASE; if (!strcasecmpstart(s, "Tor ")) s += 4; - /* Get major. */ - out->major = (int)strtol(s,&eos,10); - if (!eos || eos==s || *eos != '.') return -1; - cp = eos+1; - - /* Get minor */ - out->minor = (int) strtol(cp,&eos,10); - if (!eos || eos==cp || *eos != '.') return -1; - cp = eos+1; - - /* Get micro */ - out->micro = (int) strtol(cp,&eos,10); - if (!eos || eos==cp) return -1; - if (!*eos) { - out->status = VER_RELEASE; - out->patchlevel = 0; + cp = s; + +#define NUMBER(m) \ + do { \ + out->m = (int)strtol(cp, &eos, 10); \ + if (!eos || eos == cp) \ + return -1; \ + cp = eos; \ + } while (0) + +#define DOT() \ + do { \ + if (*cp != '.') \ + return -1; \ + ++cp; \ + } while (0) + + NUMBER(major); + DOT(); + NUMBER(minor); + if (*cp == 0) return 0; - } - cp = eos; + else if (*cp == '-') + goto status_tag; + DOT(); + NUMBER(micro); /* Get status */ - if (*cp == '.') { - out->status = VER_RELEASE; + if (*cp == 0) { + return 0; + } else if (*cp == '.') { ++cp; + } else if (*cp == '-') { + goto status_tag; } else if (0==strncmp(cp, "pre", 3)) { out->status = VER_PRE; cp += 3; @@ -4251,11 +4261,9 @@ tor_version_parse(const char *s, tor_version_t *out) return -1; } - /* Get patchlevel */ - out->patchlevel = (int) strtol(cp,&eos,10); - if (!eos || eos==cp) return -1; - cp = eos; + NUMBER(patchlevel); + status_tag: /* Get status tag. */ if (*cp == '-' || *cp == '.') ++cp; @@ -4291,6 +4299,8 @@ tor_version_parse(const char *s, tor_version_t *out) } return 0; +#undef NUMBER +#undef DOT } /** Compare two tor versions; Return <0 if a < b; 0 if a ==b, >0 if a > diff --git a/src/test/test_dir.c b/src/test/test_dir.c index c03b63b..61484f5 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -337,6 +337,42 @@ test_dir_versions(void) test_eq(VER_RELEASE, ver1.status); test_streq("", ver1.status_tag); + test_eq(0, tor_version_parse("10.1", &ver1)); + test_eq(10, ver1.major); + test_eq(1, ver1.minor); + test_eq(0, ver1.micro); + test_eq(0, ver1.patchlevel); + test_eq(VER_RELEASE, ver1.status); + test_streq("", ver1.status_tag); + test_eq(0, tor_version_parse("5.99.999", &ver1)); + test_eq(5, ver1.major); + test_eq(99, ver1.minor); + test_eq(999, ver1.micro); + test_eq(0, ver1.patchlevel); + test_eq(VER_RELEASE, ver1.status); + test_streq("", ver1.status_tag); + test_eq(0, tor_version_parse("10.1-alpha", &ver1)); + test_eq(10, ver1.major); + test_eq(1, ver1.minor); + test_eq(0, ver1.micro); + test_eq(0, ver1.patchlevel); + test_eq(VER_RELEASE, ver1.status); + test_streq("alpha", ver1.status_tag); + test_eq(0, tor_version_parse("2.1.700-alpha", &ver1)); + test_eq(2, ver1.major); + test_eq(1, ver1.minor); + test_eq(700, ver1.micro); + test_eq(0, ver1.patchlevel); + test_eq(VER_RELEASE, ver1.status); + test_streq("alpha", ver1.status_tag); + test_eq(0, tor_version_parse("1.6.8-alpha-dev", &ver1)); + test_eq(1, ver1.major); + test_eq(6, ver1.minor); + test_eq(8, ver1.micro); + test_eq(0, ver1.patchlevel); + test_eq(VER_RELEASE, ver1.status); + test_streq("alpha-dev", ver1.status_tag); + #define tt_versionstatus_op(vs1, op, vs2) \ tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t, \ (val1_ op val2_),"%d",TT_EXIT_TEST_FUNCTION)

1 0

[tor/master] Don't crash on malformed EXTENDCIRCUIT.
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit 6d6643298dfda1b146c635e3858faec7e9c9631c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 08:49:57 2015 -0500 Don't crash on malformed EXTENDCIRCUIT. Fixes 14116; bugfix on ac68704f in 0.2.2.9-alpha. --- changes/bug14116_025 | 3 +++ src/or/control.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug14116_025 b/changes/bug14116_025 new file mode 100644 index 0000000..0859f62 --- /dev/null +++ b/changes/bug14116_025 @@ -0,0 +1,3 @@ + o Minor bugfixes (controller): + - Avoid crashing on a malformed EXTENDCIRCUIT command. Fixes bug 14116; + bugfix on 0.2.2.9-alpha. diff --git a/src/or/control.c b/src/or/control.c index 9378f38..bdd91fc 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2451,6 +2451,14 @@ handle_control_extendcircuit(control_connection_t *conn, uint32_t len, goto done; } + if (smartlist_len(args) < 2) { + connection_printf_to_buf(conn, + "512 syntax error: not enough arguments.\r\n"); + SMARTLIST_FOREACH(args, char *, cp, tor_free(cp)); + smartlist_free(args); + goto done; + } + smartlist_split_string(router_nicknames, smartlist_get(args,1), ",", 0, 0); SMARTLIST_FOREACH(args, char *, cp, tor_free(cp));

1 0

[tor/master] Merge remote-tracking branch 'public/bug14116_025'
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit 3401c34151a29fe962944ce3ea77f14056c87efa Merge: a034863 6d66432 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 14:28:02 2015 -0500 Merge remote-tracking branch 'public/bug14116_025' changes/bug14116_025 | 3 +++ src/or/control.c | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0