- tor-commits - lists.torproject.org

[tor/maint-0.2.3] Fix port range in parse_port_range().
by nickm＠torproject.org 06 Jul '12

06 Jul '12

commit 62c1311b3ab57c61488ecfc8c94fabb5f2c70e6e Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jun 22 18:24:06 2012 +0300 Fix port range in parse_port_range(). --- changes/bug6218 | 3 +++ src/common/address.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/bug6218 b/changes/bug6218 new file mode 100644 index 0000000..5d5d108 --- /dev/null +++ b/changes/bug6218 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix wrong TCP port range in parse_port_range(). Fixes bug 6218; + bugfix on 0.2.1.10-alpha. diff --git a/src/common/address.c b/src/common/address.c index 30665fa..e88869f 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1526,7 +1526,7 @@ parse_port_range(const char *port, uint16_t *port_min_out, } else if (endptr && *endptr == '-') { port = endptr+1; endptr = NULL; - port_max = (int)tor_parse_long(port, 10, 1, 65536, &ok, &endptr); + port_max = (int)tor_parse_long(port, 10, 1, 65535, &ok, &endptr); if (!ok) { log_warn(LD_GENERAL, "Malformed port %s on address range; rejecting.",

1 0

[flashproxy/master] Use dummy address 0.0.1.0 in place of 0.0.0.0.
by dcf＠torproject.org 06 Jul '12

06 Jul '12

commit fdcb2d1382b430565afbcd5dcfad829479c0bb7b Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jul 6 04:43:57 2012 -0700 Use dummy address 0.0.1.0 in place of 0.0.0.0. addr == 0 is used in at least one place to indicate that no IPv4 address is set. An example is circuitbuild.c: int router_ipv6_preferred(const routerinfo_t *router) { return (!tor_addr_is_null(&router->ipv6_addr) && (router->ipv6_preferred || router->addr == 0)); } This function can return true even if router->ipv6_preferred is false, causing the later erroneous output [notice] Bridge 'xxx' has both an IPv4 and an IPv6 address. Will prefer using its IPv4 address (2600:<...>:9001). The address 0.0.0.1 doesn't work; it causes this error message: [warn] Proxy Client: unable to connect to 0.0.0.1:1 ("server rejected connection") --- README | 2 +- doc/design.txt | 2 +- torrc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index f26d0c5..68f4cfe 100644 --- a/README +++ b/README @@ -77,7 +77,7 @@ public instance of it. This way is not as realistic because all your Tor traffic will first go to a fixed address and can be easily blocked. However this is an easy way to try out the system without having to do port forwarding. - $ tor ClientTransportPlugin "websocket socks4 tor-facilitator.bamsoftware.com:9999" UseBridges 1 Bridge "websocket 0.0.0.0:1" LearnCircuitBuildTimeout 0 + $ tor ClientTransportPlugin "websocket socks4 tor-facilitator.bamsoftware.com:9999" UseBridges 1 Bridge "websocket 0.0.1.0:1" LearnCircuitBuildTimeout 0 == Troubleshooting diff --git a/doc/design.txt b/doc/design.txt index 5f58cc9..7f1e548 100644 --- a/doc/design.txt +++ b/doc/design.txt @@ -86,7 +86,7 @@ Design of flash proxies sufficient: ClientTransportPlugin websocket socks4 127.0.0.1:9001 UseBridges 1 - Bridge websocket 0.0.0.0:1 + Bridge websocket 0.0.1.0:1 LearnCircuitBuildTimeout 0 The address given for the "Bridge" option is actually irrelevant. The client transport plugin will ignore it and connect (through the flash diff --git a/torrc b/torrc index ec0b552..b04e174 100644 --- a/torrc +++ b/torrc @@ -6,5 +6,5 @@ ClientTransportPlugin websocket socks4 127.0.0.1:9001 UseBridges 1 # The address and port are ignored by the client transport plugin. -Bridge websocket 0.0.0.0:1 +Bridge websocket 0.0.1.0:1 LearnCircuitBuildTimeout 0

1 0

[tor/master] Fix compilation on 32-bit. Fix for bug 6277, not in any released tor.
by nickm＠torproject.org 05 Jul '12

05 Jul '12

commit d30783ecbb14f1df260050718621cee43bbbf208 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 16:44:07 2012 -0400 Fix compilation on 32-bit. Fix for bug 6277, not in any released tor. --- src/test/test_util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 8877444..79573f5 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1643,7 +1643,7 @@ test_util_sscanf(void) #endif #if SIZEOF_LONG == 4 - r = tor_sscanf("-2147483648. 2147483647.", "%ld. %ld.", &lng1, &lng2) + r = tor_sscanf("-2147483648. 2147483647.", "%ld. %ld.", &lng1, &lng2); test_eq(r,2); test_eq(lng1, -2147483647 - 1); test_eq(lng2, 2147483647);

1 0

r25708: {website} clean-up page and some corrections based on US labor laws. (website/trunk/about/en)
by Andrew Lewman 05 Jul '12

05 Jul '12

Author: phobos Date: 2012-07-05 19:46:53 +0000 (Thu, 05 Jul 2012) New Revision: 25708 Modified: website/trunk/about/en/jobs-coredev.wml Log: clean-up page and some corrections based on US labor laws. Modified: website/trunk/about/en/jobs-coredev.wml =================================================================== --- website/trunk/about/en/jobs-coredev.wml 2012-07-05 19:41:49 UTC (rev 25707) +++ website/trunk/about/en/jobs-coredev.wml 2012-07-05 19:46:53 UTC (rev 25708) @@ -15,6 +15,7 @@ Your job would be to work on all aspects of the main Tor network daemon and other open-source software. + This would be a contractor position starting in 2013 (with plenty of work to keep you busy), with the possibility of 2014 and beyond. @@ -24,22 +25,23 @@ <ul> -<li>Have extensive experience in C, and several other programming - languages. At least 5 years experience with C is probably necessary - for the level of expertise we want; most people would need more.</li> -<li>Have a solid understanding of issues surrounding secure C programming.</li> -<li>Be comfortable working from home (or wherever your preferred - Internet connection is).</li> -<li>Be familiar and experienced with nonblocking, event-driven networking - programs.</li> -<li>Be comfortable and experienced with interacting with users online.</li> -<li>Be comfortable and experienced with driving the entire lifecycle - of a new feature in an existing piece of software, from design to - implementation to testing.</li> -<li>Be comfortable and experienced getting code and design reviewed, - and reviewing the code and design of others.</li> -<li>Be comfortable with transparency: as a non-profit, everything we do - is in public, including your name and pay rate.</li> + <li>Have extensive experience in C, and several other programming + languages. At least 5 years experience with C is probably + necessary for the level of expertise we want; most people would + need more.</li> + <li>Have a solid understanding of issues surrounding secure + C programming.</li> + <li>Be comfortable working remotely.</li> + <li>Be familiar and experienced with nonblocking, event-driven + networking programs.</li> + <li>Be comfortable and experienced with interacting with users online.</li> + <li>Be comfortable and experienced with driving the entire + lifecycle of a new feature in an existing piece of software, + from design to implementation to testing.</li> + <li>Be comfortable and experienced getting code and design + reviewed, and reviewing the code and design of others.</li> + <li>Be comfortable with transparency: as a non-profit, everything + we do is in public, including your name and pay rate.</li> </ul> @@ -47,32 +49,35 @@ <ul> -<li>Know enough of the basics of cryptography in order to understand - how to implement our protocols and discuss changes to them. (Actually - implementing block ciphers and stuff like that isn't necessary.)</li> -<li>Know enough about networking in order to understand how to implement - our protocols and discuss changes to them.</li> -<li>Have experience with high-performance networking code.</li> -<li>Have experience with open-source software development, including - working with distributed teams across different time-zones containing - employees and volunteers of differing skill levels over email and IRC.</li> -<li>Have basic familiarity with distributed version control systems.</li> -<li>Have contributed significant chunks of code to multiple - open-source projects in the past.</li> -<li>Genuinely be excited about Tor and our values.</li> + <li>Know enough of the basics of cryptography in order to + understand how to implement our protocols and discuss changes + to them. (Actually implementing block ciphers and stuff like + that isn't necessary.)</li> + <li>Know enough about networking in order to understand how to + implement our protocols and discuss changes to them.</li> + <li>Have experience with high-performance networking code.</li> + <li>Have experience with open-source software development, + including working with distributed teams across different + time-zones containing employees and volunteers of differing + skill levels over email and IRC.</li> + <li>Have basic familiarity with distributed version control + systems.</li> + <li>Have contributed significant chunks of code to multiple + open-source projects in the past.</li> + <li>Genuinely be excited about Tor and our values.</li> </ul> -Being a core Tor developer includes triaging, -diagnosing, and fixing bugs; looking for and resolving security -issues; and working collaboratively with coworkers and volunteers -on implementing new features and protocol changes at every stage from -design to maintenance. We'd also need help making our code more scalable, -testable, and maintainable. Sometimes, we need to drop everything and -scramble to implement last-minute anticensorship schemes, or to deploy -urgent security updates. You'd also be reviewing other people's code and -designs, and looking for ways to improve it. For an idea of the -breadth and depth of the work you'd be doing, have a look at <a +Being a core Tor developer includes triaging, diagnosing, and +fixing bugs; looking for and resolving security issues; and working +collaboratively with coworkers and volunteers on implementing +new features and protocol changes at every stage from design to +maintenance. We'd also need help making our code more scalable, +testable, and maintainable. Sometimes, we need to drop everything +and scramble to implement last-minute anticensorship schemes, or to +deploy urgent security updates. You'd also be reviewing other people's +code and designs, and looking for ways to improve it. For an idea of +the breadth and depth of the work you'd be doing, have a look at <a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/ChangeLog">the ChangeLog file from the Tor source distribution</a>. @@ -82,13 +87,13 @@ <ul> -<li>Tor developers don't have an office; you can work from wherever you - want, in basically any country. You'll need to be comfortable in - this environment! We coordinate via IRC, email, and bug trackers.</li> -<li>Academic degrees are great, but not required if you have the right - experience.</li> -<li>We only write free (open source) software, and we don't believe in - software patents.</li> + <li>You'll need to be comfortable in this environment! We + coordinate via IRC, instant messaging, email, and bug + trackers.</li> + <li>Academic degrees are great, but not required if you have + the right experience.</li> + <li>We only write free and open source software, and we don't + believe in software patents.</li> </ul> @@ -96,28 +101,29 @@ <ul> -<li>Link to a sample of code you've written in the past that you're - allowed to show us.</li> -<li>Provide a CV explaining your background, experience, skills, and - other relevant qualifications.</li> -<li>List some people who can tell us more about you: these references - could be employers or coworkers, open source projects, etc.</li> -<li>Email the above to jobs at torproject.org.</li> + <li>Link to a sample of code you've written in the past that + you're allowed to show us.</li> + <li>Provide a CV explaining your background, experience, skills, + and other relevant qualifications.</li> + <li>List some people who can tell us more about you: these + references could be employers or coworkers, open source projects, + etc.</li> + <li>Email the above to jobs at torproject.org.</li> </ul> About the company: 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 3000 volunteer relays carry 14 Gbps for upwards of half a 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 14 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. + network's 3000 volunteer relays carry 14 Gbps for upwards of half a + 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 14 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. </div>

1 0

r25707: {website} some clean-ups of the desc based on feedback and pesky US la (website/trunk/about/en)
by Andrew Lewman 05 Jul '12

05 Jul '12

Author: phobos Date: 2012-07-05 19:41:49 +0000 (Thu, 05 Jul 2012) New Revision: 25707 Modified: website/trunk/about/en/jobs-browserhacker.wml Log: some clean-ups of the desc based on feedback and pesky US labor laws. Modified: website/trunk/about/en/jobs-browserhacker.wml =================================================================== --- website/trunk/about/en/jobs-browserhacker.wml 2012-07-05 19:23:30 UTC (rev 25706) +++ website/trunk/about/en/jobs-browserhacker.wml 2012-07-05 19:41:49 UTC (rev 25707) @@ -21,40 +21,38 @@ -Any candidate must: +All candidates must: <ul> -<li>Have experience in C++ and ideally Javascript. At least 5 years experience -is probably necessary for the level of expertise we want, though some of these -years can be replaced with other Object Oriented Programming and/or C -experience. If you meet this level of experience with C++/OOP, Javascript can -be learned on the job.</li> +<li>Have experience in C++ and ideally Javascript. At least 5 years +experience is probably necessary for the level of expertise we want, +though some of these years can be replaced with other Object Oriented +Programming and/or C experience. If you meet this level of experience +with C++/OOP, Javascript can be learned on the job.</li> -<li>Have a solid understanding of issues surrounding secure C++ programming -(at least to the level of avoiding them).</li> +<li>Have a solid understanding of issues surrounding secure C++ +programming (at least to the level of avoiding them).</li> -<li>Be comfortable and experienced with repeatedly diving into new, unfamiliar -codebases, looking for ways to alter and augment their functionality in -specific, goal-oriented ways.</li> +<li>Be comfortable and experienced with repeatedly diving into new, +unfamiliar codebases, looking for ways to alter and augment their +functionality in specific, goal-oriented ways.</li> -<li>Be at least passingly familiar with web technologies and how the web -works, especially the same-origin model and web tracking.</li> +<li>Be at least passingly familiar with web technologies and how the +web works, especially the same-origin model and web tracking.</li> <li>Be comfortable and experienced justifying and documenting technical decisions for a public, world-wide technical audience.</li> -<li>Be comfortable working from home (or wherever your preferred - Internet connection is).</li> +<li>Be comfortable working from remotely.</li> <li>Be comfortable and experienced with interacting with users and other developers online. Have thick enough skin to survive occasional trolling 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 (though the latter is a little -malleable with proper application of bureaucratic ninja skills).</li> +public, including your name and pay rate.</li> </ul> @@ -64,27 +62,33 @@ <ul> -<li>Already be familiar with writing addons for Mozilla Firefox or other web -browsers.</li> +<li>Already be familiar with writing addons for Mozilla Firefox or other +web browsers.</li> -<li>Already be familiar with writing patches for Mozilla Firefox or other web -browsers.</li> +<li>Already be familiar with writing patches for Mozilla Firefox or +other web browsers.</li> -<li>Already be familiar with compiling software for the Android platform.</li> +<li>Already be familiar with compiling software for the Android +platform.</li> -<li>Be capable of insanely creative yet also ruthlessly pragmatic thinking.</li> +<li>Be capable of creative yet also ruthlessly pragmatic thinking.</li> <li>Be familiar with probability, statistics, and information theory.</li> -<li>Know enough about networking to be able to visualize what HTTP 1.1 -looks like on the wire while encapsulated within Tor's network protocol.</li> +<li>Know enough about networking to be able to visualize what HTTP +1.1 looks like on the wire while encapsulated within Tor's network +protocol.</li> <li>Have experience with open-source software development, including - working with distributed teams across different time-zones containing - employees and volunteers of differing skill levels over email and IRC.</li> +working with distributed teams across different time-zones containing +employees and volunteers of differing skill levels over multiple mediums, +including email, instant messaging, and IRC.</li> + <li>Have basic familiarity with distributed version control systems.</li> -<li>Have contributed significant chunks of code to multiple - open-source projects in the past.</li> + +<li>Have contributed significant chunks of code to multiple open-source +projects in the past.</li> + <li>Genuinely be excited about Tor and our values.</li> </ul> @@ -95,29 +99,27 @@ <blockquote> -Being a Tor Browser Hacker includes triaging, diagnosing, and fixing bugs; -looking for and resolving web privacy issues; responding on short notice to -security issues; and working collaboratively with coworkers and volunteers on -implementing new features and web behavior changes. +Being a Tor Browser Hacker includes triaging, diagnosing, and fixing +bugs; looking for and resolving web privacy issues; responding on short +notice to security issues; and working collaboratively with coworkers +and volunteers on implementing new features and web behavior changes. -We'd also need help making our code more maintainable, testable, and mergeable -by upstream. Sometimes, we need to drop everything and scramble to implement -last-minute fixes, or to deploy urgent security updates. You'd also be -reviewing other people's code, designs, and academic research papers, and -looking for ways to improve upon them. +We'd also need help making our code more maintainable, testable, +and mergeable by upstream. Sometimes, we need to drop everything and +scramble to implement last-minute fixes, or to deploy urgent security +updates. You'd also be reviewing other people's code, designs, and +academic research papers, and looking for ways to improve upon them. - -For an even more detailed overview of the full breadth and depth of the work -you'd be doing, have a look at <a -href="https://www.torproject.org/projects/torbrowser/design/">The Design and -Implementation of the Tor Browser</a>, especially <a +For an even more detailed overview of the full breadth +and depth of the work you'd be doing, have a look at <a +href="https://www.torproject.org/projects/torbrowser/design/">The +Design and Implementation of the Tor Browser</a>, especially <a href="https://www.torproject.org/projects/torbrowser/design/#DesignRequirements">The Design Requirements</a> section. - </blockquote> @@ -127,13 +129,14 @@ <ul> -<li>Tor developers don't have an office; you can work from wherever you - want, in basically any country. You'll need to be comfortable in - this environment! We coordinate via IRC, email, and bug trackers.</li> -<li>Academic degrees are great, but not required if you have the right - experience.</li> -<li>We only write free (open source) software, and we don't believe in - software patents.</li> + <li>Tor developers don't have an office; you can work from + wherever you want, in basically any country. You'll need to be + comfortable in this environment! We coordinate via IRC, email, + and bug trackers.</li> + <li>Academic degrees are great, but not required if you have + the right experience.</li> + <li>We only write free and open source software, and we don't + believe in software patents.</li> </ul> @@ -141,29 +144,30 @@ <ul> -<li>Link to a sample of code you've written in the past that you're - allowed to show us.</li> -<li>Provide a CV explaining your background, experience, skills, and - other relevant qualifications.</li> -<li>List some people who can tell us more about you: these references - could be employers or coworkers, open source projects, etc.</li> -<li>Email the above to jobs at torproject.org, specifying the "Browser - Hacker" position.</li> + <li>Link to a sample of code you've written in the past that + you're allowed to show us.</li> + <li>Provide a CV explaining your background, experience, skills, + and other relevant qualifications.</li> + <li>List some people who can tell us more about you: these + references could be employers or coworkers, open source projects, + etc.</li> + <li>Email the above to jobs at torproject.org, specifying the + "Browser Hacker" position.</li> </ul> About the company: 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 3000 volunteer relays carry 14 Gbps for upwards of half a 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 14 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. + network's 3000 volunteer relays carry 14 Gbps for upwards of half a + 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 14 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. </div>

1 0

r25706: {website} sitemap no longer exists. remove from robots. (website/trunk)
by Andrew Lewman 05 Jul '12

05 Jul '12

Author: phobos Date: 2012-07-05 19:23:30 +0000 (Thu, 05 Jul 2012) New Revision: 25706 Modified: website/trunk/robots.txt Log: sitemap no longer exists. remove from robots. Modified: website/trunk/robots.txt =================================================================== --- website/trunk/robots.txt 2012-06-30 23:07:44 UTC (rev 25705) +++ website/trunk/robots.txt 2012-07-05 19:23:30 UTC (rev 25706) @@ -1,4 +1,2 @@ -Sitemap: http://www.torproject.org/sitemap.xml -Sitemap: https://www.torproject.org/sitemap.xml User-Agent: * Allow: /

1 0

[flashproxy/master] Use the 0.0.0.0:1 for the dummy Bridge address.
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit bf51cf0b761214e39f635d14451582d27a8915ab Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 5 07:36:52 2012 -0700 Use the 0.0.0.0:1 for the dummy Bridge address. It was more confusing when we used the same address as the client transport plugin's listening address; it wasn't clear which one was actually used and which was ignored. --- README | 2 +- doc/design.txt | 2 +- experiments/exercise/exercise.sh | 2 +- torrc | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README b/README index d14c9cc..f26d0c5 100644 --- a/README +++ b/README @@ -77,7 +77,7 @@ public instance of it. This way is not as realistic because all your Tor traffic will first go to a fixed address and can be easily blocked. However this is an easy way to try out the system without having to do port forwarding. - $ tor ClientTransportPlugin "websocket socks4 tor-facilitator.bamsoftware.com:9999" UseBridges 1 Bridge "websocket 127.0.0.1:9001" LearnCircuitBuildTimeout 0 + $ tor ClientTransportPlugin "websocket socks4 tor-facilitator.bamsoftware.com:9999" UseBridges 1 Bridge "websocket 0.0.0.0:1" LearnCircuitBuildTimeout 0 == Troubleshooting diff --git a/doc/design.txt b/doc/design.txt index 7520cb5..5f58cc9 100644 --- a/doc/design.txt +++ b/doc/design.txt @@ -86,7 +86,7 @@ Design of flash proxies sufficient: ClientTransportPlugin websocket socks4 127.0.0.1:9001 UseBridges 1 - Bridge websocket 127.0.0.1:9001 + Bridge websocket 0.0.0.0:1 LearnCircuitBuildTimeout 0 The address given for the "Bridge" option is actually irrelevant. The client transport plugin will ignore it and connect (through the flash diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index 554e5fb..c60a97e 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -26,7 +26,7 @@ PIDS_TO_KILL+=($!) sleep 20 -"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 127.0.0.1:$LOCAL_PORT" LearnCircuitBuildTimeout 0 & +"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 0.0.0.0:1" LearnCircuitBuildTimeout 0 & PIDS_TO_KILL+=($!) sleep 60 diff --git a/torrc b/torrc index d502265..ec0b552 100644 --- a/torrc +++ b/torrc @@ -5,5 +5,6 @@ ClientTransportPlugin websocket socks4 127.0.0.1:9001 UseBridges 1 -Bridge websocket 127.0.0.1:9001 +# The address and port are ignored by the client transport plugin. +Bridge websocket 0.0.0.0:1 LearnCircuitBuildTimeout 0

1 0

[flashproxy/master] Listen only on localhost in flashproxy-exercise.
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit f06895533bf78916b956936224d85be18deddbd6 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 5 07:39:43 2012 -0700 Listen only on localhost in flashproxy-exercise. --- experiments/exercise/exercise.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index c60a97e..6a91806 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -21,7 +21,7 @@ trap stop EXIT date cd "$FLASHPROXY_DIR" -./flashproxy-client.py --register ":$LOCAL_PORT" ":$REMOTE_PORT" & +./flashproxy-client.py --register "127.0.0.1:$LOCAL_PORT" ":$REMOTE_PORT" & PIDS_TO_KILL+=($!) sleep 20

1 0

[flashproxy/master] When I "make dist" I want it always to delete the dist directory.
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit 3c748dd25809d7952ab8662ead76d60c6cda63f5 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 5 07:19:30 2012 -0700 When I "make dist" I want it always to delete the dist directory. "make sign" should remake the dist only if necessary. --- Makefile | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f3232aa..5981bd2 100644 --- a/Makefile +++ b/Makefile @@ -22,13 +22,14 @@ test: DISTNAME = flashproxy-client-$(VERSION) DISTDIR = dist/$(DISTNAME) -dist/$(DISTNAME).zip: +dist: rm -rf dist mkdir -p $(DISTDIR) cp -f $(CLIENT_DIST_FILES) $(DISTDIR) cd dist && zip -q -r -9 $(DISTNAME).zip $(DISTNAME) -dist: dist/$(DISTNAME).zip +dist/$(DISTNAME).zip: + $(MAKE) dist sign: dist/$(DISTNAME).zip cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip

1 0

[flashproxy/master] The dist zip should depend on the files within it.
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit 3dc41f8fe394b65d1f37feb09ff364ec801c6644 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 5 07:20:41 2012 -0700 The dist zip should depend on the files within it. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 5981bd2..dc8e92a 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ dist: cp -f $(CLIENT_DIST_FILES) $(DISTDIR) cd dist && zip -q -r -9 $(DISTNAME).zip $(DISTNAME) -dist/$(DISTNAME).zip: +dist/$(DISTNAME).zip: $(CLIENT_DIST_FILES) $(MAKE) dist sign: dist/$(DISTNAME).zip

1 0