- tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 27 Jun '12

27 Jun '12

1 0

[tor/maint-0.2.3] Allow wildcarded mapaddress targets in controller MAPADDRESS command
by nickm＠torproject.org 27 Jun '12

27 Jun '12

commit 23f2e37ff75ef539cc5634e3f48f9a86cb95a2d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 27 23:38:04 2012 -0400 Allow wildcarded mapaddress targets in controller MAPADDRESS command --- changes/bug6244 | 4 ++++ src/or/control.c | 18 ++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/changes/bug6244 b/changes/bug6244 new file mode 100644 index 0000000..c6d64ff --- /dev/null +++ b/changes/bug6244 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Allow wildcarded mapaddress targets to be specified on the controlport. + Partial fix for bug 6244; bugfix on 0.2.3.9-alpha. + diff --git a/src/or/control.c b/src/or/control.c index 9fc28bb..6675c01 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1313,6 +1313,17 @@ handle_control_takeownership(control_connection_t *conn, uint32_t len, return 0; } +/** Return true iff <b>addr</b> is unusable as a mapaddress target because of + * containing funny characters. */ +static int +address_is_invalid_mapaddress_target(const char *addr) +{ + if (!strcmpstart(addr, "*.")) + return address_is_invalid_destination(addr+2, 1); + else + return address_is_invalid_destination(addr, 1); +} + /** Called when we get a MAPADDRESS command; try to bind all listed addresses, * and report success or failure. */ static int @@ -1331,14 +1342,13 @@ handle_control_mapaddress(control_connection_t *conn, uint32_t len, reply = smartlist_new(); smartlist_split_string(lines, body, " ", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); - SMARTLIST_FOREACH(lines, char *, line, - { + SMARTLIST_FOREACH_BEGIN(lines, char *, line) { tor_strlower(line); smartlist_split_string(elts, line, "=", 0, 2); if (smartlist_len(elts) == 2) { const char *from = smartlist_get(elts,0); const char *to = smartlist_get(elts,1); - if (address_is_invalid_destination(to, 1)) { + if (address_is_invalid_mapaddress_target(to)) { smartlist_add_asprintf(reply, "512-syntax error: invalid address '%s'", to); log_warn(LD_CONTROL, @@ -1370,7 +1380,7 @@ handle_control_mapaddress(control_connection_t *conn, uint32_t len, } SMARTLIST_FOREACH(elts, char *, cp, tor_free(cp)); smartlist_clear(elts); - }); + } SMARTLIST_FOREACH_END(line); SMARTLIST_FOREACH(lines, char *, cp, tor_free(cp)); smartlist_free(lines); smartlist_free(elts);

1 0

r25696: {} Add a description for a potential Tor Browser hacker opening (website/trunk/about/en)
by Mike Perry 27 Jun '12

27 Jun '12

Author: mikeperry Date: 2012-06-28 03:22:36 +0000 (Thu, 28 Jun 2012) New Revision: 25696 Added: website/trunk/about/en/jobs-browserhacker.wml Log: Add a description for a potential Tor Browser hacker opening. Added: website/trunk/about/en/jobs-browserhacker.wml =================================================================== --- website/trunk/about/en/jobs-browserhacker.wml (rev 0) +++ website/trunk/about/en/jobs-browserhacker.wml 2012-06-28 03:22:36 UTC (rev 25696) @@ -0,0 +1,183 @@ +## translation metadata +# Revision: $Revision: 25666 $ +# Translation-Priority: 3-low + +#include "head.wmi" TITLE="Tor Project: Jobs (core developer)" 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>The Tor Project is looking for a Browser Hacker!</h1> + +<p> + +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 (starting as soon as you're ready and with +plenty of work to keep you busy), with the possibility of 2013 and beyond. + +</p> + +<p> +Any candidate must: +</p> + +<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 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 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 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> + +</ul> + +<p> +An ideal candidate would also: +</p> + +<ul> + +<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 compiling software for the Android platform.</li> + +<li>Be capable of insanely creative yet also ruthlessly pragmatic thinking.</li> + +<li>Be familiar with probability, statistics, and information theory.</li> + +<li>Know enough about networking in 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> +<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> + +<p> +Detailed job description: +</p> + +<blockquote> + +<p> + +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. + +</p> + +<p> + +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. + +</p> + +<p> + +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. + +</p> + +</blockquote> + +<p> +Other notes: +</p> + +<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> +</ul> + +<p> +How to apply: +</p> + +<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> +</ul> + +<p> +About the company:<br> + 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 13 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> + + </div> +  + <div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi> +

1 0

[tor/maint-0.2.3] merge changes files into upcoming changelog
by arma＠torproject.org 27 Jun '12

27 Jun '12

commit 0b3f5ca11f276841f498cf7164016682911a42bd Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Jun 27 21:32:17 2012 -0400 merge changes files into upcoming changelog --- ChangeLog | 59 +++++++++++++++++++++++++++++++++++++++ changes/bug3311 | 5 --- changes/bug4748 | 4 -- changes/bug5099 | 3 -- changes/bug5557 | 3 -- changes/bug5932 | 3 -- changes/bug6028 | 4 -- changes/bug6169 | 4 -- changes/bug6173 | 5 --- changes/bug6203 | 5 --- changes/bug6211 | 4 -- changes/bug6226 | 3 -- changes/bug6227 | 3 -- changes/bug6238 | 3 -- changes/check_correct_flav_sigs | 4 -- changes/clang_strcspn | 3 -- changes/descriptor_limit | 2 - changes/envvar_test | 2 - changes/log_bad_md_entry | 3 -- changes/move_cached_gtod | 3 -- 20 files changed, 59 insertions(+), 66 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2e9f45..7c88187 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,62 @@ +Changes in version 0.2.3.18-rc - 2012-06-28 + + o Major bugfixes: + - Make our linker option detection code more robust against linkers + such as on FreeBSD 8, where a bad combination of options completes + successfully but makes an unrunnable binary. Fixes bug 6173; + bugfix on 0.2.3.17-beta. + + o Minor bugfixes (on 0.2.2.x and earlier): + - Avoid a false positive in the util/threads unit test by increasing + the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha. + - Replace "Sending publish request" log messages with "Launching + upload", so that they no longer confusingly imply that we're + sending somtheing to a directory we might not even be connected + to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha. + - When checking for requested signatures on the latest consensus + before serving it to a client, make sure to check the right + consensus flavor. Bugfix on 0.2.2.6-alpha. + - Downgrade "eventdns rejected address" message to LOG_PROTOCOL_WARN. + Fixes bug 5932; bugfix on 0.2.2.7-alpha. + + o Minor bugfixes (on 0.2.3.x): + - Downgrade a message about cleaning the microdescriptor cache to + "info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha. + - Improve log message issued when a managed proxy fails to + launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha. + - Don't do DNS lookups when parsing corrupted managed proxy protocol + messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha. + - Avoid a warning caused by using strcspn() from glibc with clang 3.0. + Bugfix on 0.2.3.13-alpha. + - Make format_helper_exit_status() avoid unnecessary space padding and + stop confusing log_from_pipe(). Fixes ticket 5557. + - Make sure to set *socket_error in all error cases in + connection_connect(), so it can't produce a warning about errno + being zero from errno_to_orconn_end_reason(). Resolves ticket 6028. + - Remove non-bug log messages about running with circuit timeout + learning enabled from LD_BUG. Fixes bug 6169; bugfix on + 0.2.3.17-beta. + - Disable a spurious warning about reading on a marked and flushing + connection. We shouldn't be doing that, but apparently we + sometimes do. Fixes bug 6203; bugfix on 0.2.3.17-beta. + - Fix a bug that stopped AllowDotExit from working on addresses + that had an entry in the DNS cache. Fixes bug 6211; bugfix on + 0.2.3.17-beta. + - Log a BUG message at INFO if we have a networkstatus with a missing + entry for some microdescriptor. + + o Code simplification, refactoring, unit tests: + - Move tor_gettimeofday_cached() into compat_libevent.c, and use + Libevent's notion of cached time when possible. + - Remove duplicate code for invoking getrlimit() from control.c. + - Add a unit test for the environment_variable_names_equal function. + + o Documentation: + - Document the --defaults-torrc option, and the new (in 0.2.3) + semantics for overriding, extending, and clearing lists of + options. Closes bug 4748. + + Changes in version 0.2.3.17-beta - 2012-06-15 Tor 0.2.3.17-beta enables compiler and linker hardening by default, gets our TLS handshake back on track for being able to blend in with diff --git a/changes/bug3311 b/changes/bug3311 deleted file mode 100644 index 014d18d..0000000 --- a/changes/bug3311 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Replace "Sending publish request" log messages with "Launching - upload", so that they no longer confusingly imply that we're - sending somtheing to a directory we might not even be connected - to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha. diff --git a/changes/bug4748 b/changes/bug4748 deleted file mode 100644 index 9c0f9cf..0000000 --- a/changes/bug4748 +++ /dev/null @@ -1,4 +0,0 @@ - o Documentation: - - Document the --defaults-torrc option, and the new (in 0.2.3) - semantics for overriding, extending, and clearing lists of - options. Closes bug 4748. diff --git a/changes/bug5099 b/changes/bug5099 deleted file mode 100644 index 4c46a39..0000000 --- a/changes/bug5099 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Improve log message issued when a managed proxy fails to - launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha. diff --git a/changes/bug5557 b/changes/bug5557 deleted file mode 100644 index c73fbe2..0000000 --- a/changes/bug5557 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes - - Make format_helper_exit_status() avoid unnecessary space padding and - stop confusing log_from_pipe(). Fixes ticket 5557. diff --git a/changes/bug5932 b/changes/bug5932 deleted file mode 100644 index f2ca98e..0000000 --- a/changes/bug5932 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Downgrade "eventdns rejected address" message to LOG_PROTOCOL_WARN. - Fixes bug 5932; bugfix on 0.2.2.7-alpha. diff --git a/changes/bug6028 b/changes/bug6028 deleted file mode 100644 index fedd02f..0000000 --- a/changes/bug6028 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Make sure to set *socket_error in all error cases in - connection_connect(), so it can't produce a warning about errno being - zero from errno_to_orconn_end_reason(). Resolves ticket 6028. diff --git a/changes/bug6169 b/changes/bug6169 deleted file mode 100644 index 9880fc9..0000000 --- a/changes/bug6169 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Remove a non-bug log messages about running with circuit timeout - learning enabled from LD_BUG. Fixes bug 6169; bugfix on - 0.2.3.17-beta. diff --git a/changes/bug6173 b/changes/bug6173 deleted file mode 100644 index 3b467a9..0000000 --- a/changes/bug6173 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - Make our linker option detection code more robust against linkers - where a bad combination of options completes successfully but - makes an unrunnable binary. Fixes bug 6173; bugfix on 0.2.3.17-beta. - diff --git a/changes/bug6203 b/changes/bug6203 deleted file mode 100644 index bf96753..0000000 --- a/changes/bug6203 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Disable a spurious warning about reading on a marked and flushing - connection. We shouldn't be doing that, but apparently we - sometimes do. Fix for bug 6203; bugfix on 0.2.3.17-beta. - diff --git a/changes/bug6211 b/changes/bug6211 deleted file mode 100644 index 2c8d9b8..0000000 --- a/changes/bug6211 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Fix a bug that stopped AllowDotExit from working on addresses - that had an entry in the DNS cache. Fixes bug 6211; bugfix on - 0.2.3.17-beta. diff --git a/changes/bug6226 b/changes/bug6226 deleted file mode 100644 index 7cbee10..0000000 --- a/changes/bug6226 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Don't do DNS lookups when parsing corrupted managed proxy - protocol messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha. diff --git a/changes/bug6227 b/changes/bug6227 deleted file mode 100644 index 77b06ac..0000000 --- a/changes/bug6227 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (unit tests): - - Avoid a false positive in the util/threads unit test by increasing - the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha. diff --git a/changes/bug6238 b/changes/bug6238 deleted file mode 100644 index 67cfd1d..0000000 --- a/changes/bug6238 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Downgrade a message about cleaning the microdescriptor cache to - "info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha. diff --git a/changes/check_correct_flav_sigs b/changes/check_correct_flav_sigs deleted file mode 100644 index db21182..0000000 --- a/changes/check_correct_flav_sigs +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - When checking for requested signatures on the latest consensus before - serving it to a client, make sure to check the right consensus flavor. - Bugfix on 0.2.2.6-alpha. diff --git a/changes/clang_strcspn b/changes/clang_strcspn deleted file mode 100644 index 38670ac..0000000 --- a/changes/clang_strcspn +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Avoid a warning caused by using strcspn from glibc with clang 3.0. - Bugfix on 0.2.3.13-alpha. diff --git a/changes/descriptor_limit b/changes/descriptor_limit deleted file mode 100644 index 29be3d9..0000000 --- a/changes/descriptor_limit +++ /dev/null @@ -1,2 +0,0 @@ - o Code simplification and refactoring: - - Remove duplicate code for invoking getrlimit() from control.c. diff --git a/changes/envvar_test b/changes/envvar_test deleted file mode 100644 index d76a817..0000000 --- a/changes/envvar_test +++ /dev/null @@ -1,2 +0,0 @@ - o New unit tests: - - Add a unit test for the environment_variable_names_equal function. \ No newline at end of file diff --git a/changes/log_bad_md_entry b/changes/log_bad_md_entry deleted file mode 100644 index 3c65327..0000000 --- a/changes/log_bad_md_entry +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (debugging): - - Log a BUG message at INFO if we have a networkstatus with a missing - entry for some microdescriptor. diff --git a/changes/move_cached_gtod b/changes/move_cached_gtod deleted file mode 100644 index 53d8092..0000000 --- a/changes/move_cached_gtod +++ /dev/null @@ -1,3 +0,0 @@ - o Code simplification and refactoring: - - Move tor_gettimeofday_cached() into compat_libevent.c, and use - Libevent's notion of cached time when possible.

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 27 Jun '12

27 Jun '12

commit a65ffdc580a940120e8f7baee32705d66429e3be Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 27 12:15:10 2012 +0000 Update translations for orbot_completed --- values-hu/strings.xml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/values-hu/strings.xml b/values-hu/strings.xml index 37f9862..68f3339 100644 --- a/values-hu/strings.xml +++ b/values-hu/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">Belépő csomópontok</string> <string name="pref_entrance_node_summary">Ujjlenyomatok, becenevek, országok és címek az első ugráshoz</string> <string name="pref_entrance_node_dialog">Belépő csomópontok megadása</string> - <string name="pref_use_whispercore">WhisperCore használata</string> - <string name="pref_use_whispercore_summary">Az eredeti NetFilter API használata amit a WhisperSystems biztosít (olyan eszköz szükséges, amire WhisperCore van telepítve)</string> +  + <string name="pref_proxy_title">Kimenő hálózati proxy</string> <string name="pref_proxy_type_title">Proxy típus</string> <string name="pref_proxy_type_summary">A Proxy szerver által használandó protokoll: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Adja meg a Proxy típust</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 27 Jun '12

27 Jun '12

commit c1e63ae117c30871490b60d966874c9a8d4609ad Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 27 12:15:06 2012 +0000 Update translations for orbot --- values-hu/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/values-hu/strings.xml b/values-hu/strings.xml index 64112cb..68f3339 100644 --- a/values-hu/strings.xml +++ b/values-hu/strings.xml @@ -121,7 +121,7 @@ <string name="pref_entrance_node_dialog">Belépő csomópontok megadása</string>  - <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_title">Kimenő hálózati proxy</string> <string name="pref_proxy_type_title">Proxy típus</string> <string name="pref_proxy_type_summary">A Proxy szerver által használandó protokoll: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Adja meg a Proxy típust</string>

1 0

[metrics-web/master] Fix missing values in relay flags graph.
by karsten＠torproject.org 27 Jun '12

27 Jun '12

commit d759a27b986bc64e98720d74082c38a2e635df11 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jun 27 11:45:28 2012 +0200 Fix missing values in relay flags graph. --- rserve/graphs.R | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index 41dd22b..0331750 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -608,6 +608,15 @@ plot_relayflags <- function(start, end, flags, granularity, path, dpi) { variable = paste("avg_", c("running", "exit", "guard", "fast", "stable"), sep = ""), value = rep(NA, 5)), networksize) + dates <- seq(from = as.Date(start, "%Y-%m-%d"), + to = as.Date(end, "%Y-%m-%d"), by="1 day") + missing <- setdiff(dates, networksize$date) + if (length(missing) > 0) + networksize <- rbind(data.frame( + date = as.Date(rep(missing, 5), origin = "1970-01-01"), + variable = paste("avg_", c("running", "exit", "guard", "fast", + "stable"), sep = ""), + value = rep(NA, length(missing) * 5)), networksize) date_breaks <- date_breaks( as.numeric(max(as.Date(networksize$date, "%Y-%m-%d")) - min(as.Date(networksize$date, "%Y-%m-%d"))))

1 0

[vidalia/alpha] Fix segmentation fault when trying to close an already closed circuit
by chiiph＠torproject.org 26 Jun '12

26 Jun '12

commit 4c6cf86d215b9a2cd0cbfed7d9769ec8724e5483 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Jun 26 20:07:03 2012 -0300 Fix segmentation fault when trying to close an already closed circuit --- changes/bug6243 | 3 +++ src/vidalia/network/CircuitListWidget.cpp | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/changes/bug6243 b/changes/bug6243 new file mode 100644 index 0000000..2b51ca5 --- /dev/null +++ b/changes/bug6243 @@ -0,0 +1,3 @@ + Bugfixes relative to Vidalia 0.3.x: + o Fix segmentation fault when trying to close an already closed circuit in + the Network Map. Fixes bug 6243. diff --git a/src/vidalia/network/CircuitListWidget.cpp b/src/vidalia/network/CircuitListWidget.cpp index 3871503..4773d9b 100644 --- a/src/vidalia/network/CircuitListWidget.cpp +++ b/src/vidalia/network/CircuitListWidget.cpp @@ -79,8 +79,11 @@ CircuitListWidget::customContextMenuRequested(const QPoint &pos) if (!item->parent()) { /* A circuit was selected */ CircuitItem *circuitItem = dynamic_cast<CircuitItem *>(item); - if (!circuitItem) + if (!circuitItem and + ((circuitItem->circuit().status() == Circuit::Closed) or + (circuitItem->circuit().status() == Circuit::Failed))) return; + CircuitId id = circuitItem->id(); /* Set up the circuit context menu */ QAction *zoomAct = new QAction(QIcon(IMG_ZOOM), @@ -98,14 +101,15 @@ CircuitListWidget::customContextMenuRequested(const QPoint &pos) * selected */ QAction* action = menu.exec(mapToGlobal(pos)); if (action == closeAct) - emit closeCircuit(circuitItem->id()); + emit closeCircuit(id); else if (action == zoomAct) - emit zoomToCircuit(circuitItem->id()); + emit zoomToCircuit(id); } else { /* A stream was selected */ StreamItem *streamItem = dynamic_cast<StreamItem *>(item); if (!streamItem) return; + StreamId id = streamItem->id(); /* Set up the stream context menu */ QAction *closeAct = new QAction(QIcon(IMG_CLOSE), @@ -116,7 +120,7 @@ CircuitListWidget::customContextMenuRequested(const QPoint &pos) * selected */ QAction* action = menu.exec(mapToGlobal(pos)); if (action == closeAct) - emit closeStream(streamItem->id()); + emit closeStream(id); } }

1 0

[tor/master] Bump the test util/threads timeout up to 150 sec
by nickm＠torproject.org 26 Jun '12

26 Jun '12

commit 4645f28c3b125f9d281eb457d110c431a6a0b166 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 25 13:44:34 2012 -0400 Bump the test util/threads timeout up to 150 sec This should make some debian build systems happier. Also, increase the select() timeout to a more reasonable 100 msec. --- changes/bug6227 | 3 +++ src/test/test_util.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug6227 b/changes/bug6227 new file mode 100644 index 0000000..77b06ac --- /dev/null +++ b/changes/bug6227 @@ -0,0 +1,3 @@ + o Minor bugfixes (unit tests): + - Avoid a false positive in the util/threads unit test by increasing + the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha. diff --git a/src/test/test_util.c b/src/test/test_util.c index fab9595..9b9fccf 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1186,7 +1186,7 @@ test_util_threads(void) #ifndef _WIN32 struct timeval tv; tv.tv_sec=0; - tv.tv_usec=10; + tv.tv_usec=100*1000; #endif #ifndef TOR_IS_MULTITHREADED /* Skip this test if we aren't threading. We should be threading most @@ -1213,7 +1213,7 @@ test_util_threads(void) if (strmap_get(_thread_test_strmap, "thread 1") && strmap_get(_thread_test_strmap, "thread 2")) { done = 1; - } else if (time(NULL) > started + 25) { + } else if (time(NULL) > started + 150) { timedout = done = 1; } tor_mutex_release(_thread_test_mutex);

1 0

[tor/master] Merge remote-tracking branch 'public/bug6227' into maint-0.2.3
by nickm＠torproject.org 26 Jun '12

26 Jun '12

commit 6330d2d9e6dc8cdeceea9486ad96e57487d6d232 Merge: 5fad3dc 4645f28 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 11:03:56 2012 -0400 Merge remote-tracking branch 'public/bug6227' into maint-0.2.3 changes/bug6227 | 3 +++ src/test/test_util.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0