April 2013 - tor-commits - lists.torproject.org

[tor/maint-0.2.4] Test networkstatus_getinfo_helper_single
by nickm＠torproject.org 18 Apr '13

18 Apr '13

commit 4d672f3ae3467203e7badc214576ae7cf7ead9e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 2 13:59:53 2013 -0400 Test networkstatus_getinfo_helper_single --- src/test/test_dir.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 71008b5..42bdb9c 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2217,6 +2217,39 @@ test_dir_v2_dir(void *arg) cached_dir_decref(v2); } +static void +test_dir_fmt_control_ns(void *arg) +{ + char *s = NULL; + routerstatus_t rs; + (void)arg; + + memset(&rs, 0, sizeof(rs)); + rs.published_on = 1364925198; + strlcpy(rs.nickname, "TetsuoMilk", sizeof(rs.nickname)); + memcpy(rs.identity_digest, "Stately, plump Buck ", DIGEST_LEN); + memcpy(rs.descriptor_digest, "Mulligan came up fro", DIGEST_LEN); + rs.addr = 0x20304050; + rs.or_port = 9001; + rs.dir_port = 9002; + rs.is_exit = 1; + rs.is_fast = 1; + rs.is_flagged_running = 1; + rs.has_bandwidth = 1; + rs.bandwidth = 1000; + + s = networkstatus_getinfo_helper_single(&rs); + tt_assert(s); + tt_str_op(s, ==, + "r TetsuoMilk U3RhdGVseSwgcGx1bXAgQnVjayA " + "TXVsbGlnYW4gY2FtZSB1cCBmcm8 2013-04-02 17:53:18 " + "32.48.64.80 9001 9002\n" + "s Exit Fast Running\n" + "w Bandwidth=1000\n"); + + done: + tor_free(s); +} #define DIR_LEGACY(name) \ { #name, legacy_test_helper, TT_FORK, &legacy_setup, test_dir_ ## name } @@ -2238,6 +2271,7 @@ struct testcase_t dir_tests[] = { DIR_LEGACY(clip_unmeasured_bw), DIR_LEGACY(clip_unmeasured_bw_alt), DIR(v2_dir, TT_FORK), + DIR(fmt_control_ns, 0), END_OF_TESTCASES };

1 0

[tor/maint-0.2.4] Remove the unused pk3 variable from test_dir_formats
by nickm＠torproject.org 18 Apr '13

18 Apr '13

commit cb74b5a1526188878d8e55a186f13fed164c9ffc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 2 14:54:32 2013 -0400 Remove the unused pk3 variable from test_dir_formats --- src/test/test_dir.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 668d28f..6bcb6f0 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -78,10 +78,10 @@ test_dir_formats(void) char buf2[8192]; char platform[256]; char fingerprint[FINGERPRINT_LEN+1]; - char *pk1_str = NULL, *pk2_str = NULL, *pk3_str = NULL, *cp; - size_t pk1_str_len, pk2_str_len, pk3_str_len; + char *pk1_str = NULL, *pk2_str = NULL, *cp; + size_t pk1_str_len, pk2_str_len; routerinfo_t *r1=NULL, *r2=NULL; - crypto_pk_t *pk1 = NULL, *pk2 = NULL, *pk3 = NULL; + crypto_pk_t *pk1 = NULL, *pk2 = NULL; routerinfo_t *rp1 = NULL, *rp2 = NULL; addr_policy_t *ex1, *ex2; routerlist_t *dir1 = NULL, *dir2 = NULL; @@ -90,9 +90,8 @@ test_dir_formats(void) pk1 = pk_generate(0); pk2 = pk_generate(1); - pk3 = pk_generate(2); - test_assert(pk1 && pk2 && pk3); + test_assert(pk1 && pk2); hibernate_set_state_for_testing_(HIBERNATE_STATE_LIVE); @@ -143,8 +142,6 @@ test_dir_formats(void) &pk1_str_len)); test_assert(!crypto_pk_write_public_key_to_string(pk2 , &pk2_str, &pk2_str_len)); - test_assert(!crypto_pk_write_public_key_to_string(pk3 , &pk3_str, - &pk3_str_len)); /* XXXX025 router_dump_to_string should really take this from ri.*/ options->ContactInfo = tor_strdup("Magri White " @@ -274,10 +271,8 @@ test_dir_formats(void) tor_free(buf); tor_free(pk1_str); tor_free(pk2_str); - tor_free(pk3_str); if (pk1) crypto_pk_free(pk1); if (pk2) crypto_pk_free(pk2); - if (pk3) crypto_pk_free(pk3); if (rp1) routerinfo_free(rp1); tor_free(dir1); /* XXXX And more !*/ tor_free(dir2); /* And more !*/

1 0

[tor/maint-0.2.4] Re-enable test for parsing and generating descriptor with exit policy
by nickm＠torproject.org 18 Apr '13

18 Apr '13

commit 992bbd02f9fef33db4fed6c704a20037fd6118d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 2 14:45:13 2013 -0400 Re-enable test for parsing and generating descriptor with exit policy Looks like I turned this off in 6ac42f5e back in 2003 and never got around to making it work again. There has been no small amount of code drift. --- src/or/router.c | 2 + src/test/test_dir.c | 77 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 58 insertions(+), 21 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index a391cdd..e5d53e0 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2235,6 +2235,8 @@ char * router_dump_router_to_string(routerinfo_t *router, crypto_pk_t *ident_key) { + /* XXXX025 Make this look entirely at its arguments, and not at globals. + */ char *onion_pkey = NULL; /* Onion key, PEM-encoded. */ char *identity_pkey = NULL; /* Identity key, PEM-encoded. */ char digest[DIGEST_LEN]; diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 42bdb9c..668d28f 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -82,9 +82,11 @@ test_dir_formats(void) size_t pk1_str_len, pk2_str_len, pk3_str_len; routerinfo_t *r1=NULL, *r2=NULL; crypto_pk_t *pk1 = NULL, *pk2 = NULL, *pk3 = NULL; - routerinfo_t *rp1 = NULL; + routerinfo_t *rp1 = NULL, *rp2 = NULL; addr_policy_t *ex1, *ex2; routerlist_t *dir1 = NULL, *dir2 = NULL; + or_options_t *options = get_options_mutable(); + const addr_policy_t *p; pk1 = pk_generate(0); pk2 = pk_generate(1); @@ -133,8 +135,8 @@ test_dir_formats(void) r2->identity_pkey = crypto_pk_dup_key(pk1); r2->bandwidthrate = r2->bandwidthburst = r2->bandwidthcapacity = 3000; r2->exit_policy = smartlist_new(); - smartlist_add(r2->exit_policy, ex2); smartlist_add(r2->exit_policy, ex1); + smartlist_add(r2->exit_policy, ex2); r2->nickname = tor_strdup("Fred"); test_assert(!crypto_pk_write_public_key_to_string(pk1, &pk1_str, @@ -144,7 +146,11 @@ test_dir_formats(void) test_assert(!crypto_pk_write_public_key_to_string(pk3 , &pk3_str, &pk3_str_len)); + /* XXXX025 router_dump_to_string should really take this from ri.*/ + options->ContactInfo = tor_strdup("Magri White " + "<magri(a)elsewhere.example.com>"); buf = router_dump_router_to_string(r1, pk2); + tor_free(options->ContactInfo); test_assert(buf); strlcpy(buf2, "router Magri 18.244.0.1 9000 0 9003\n" @@ -167,6 +173,8 @@ test_dir_formats(void) strlcat(buf2, "signing-key\n", sizeof(buf2)); strlcat(buf2, pk2_str, sizeof(buf2)); strlcat(buf2, "hidden-service-dir\n", sizeof(buf2)); + strlcat(buf2, "contact Magri White <magri(a)elsewhere.example.com>\n", + sizeof(buf2)); strlcat(buf2, "reject *:*\nrouter-signature\n", sizeof(buf2)); buf[strlen(buf2)] = '\0'; /* Don't compare the sig; it's never the same * twice */ @@ -189,35 +197,62 @@ test_dir_formats(void) test_assert(crypto_pk_cmp_keys(rp1->identity_pkey, pk2) == 0); //test_assert(rp1->exit_policy == NULL); -#if 0 - /* XXX Once we have exit policies, test this again. XXX */ - strlcpy(buf2, "router tor.tor.tor 9005 0 0 3000\n", sizeof(buf2)); + strlcpy(buf2, + "router Fred 1.1.1.1 9005 0 0\n" + "platform Tor "VERSION" on ", sizeof(buf2)); + strlcat(buf2, get_uname(), sizeof(buf2)); + strlcat(buf2, "\n" + "protocols Link 1 2 Circuit 1\n" + "published 1970-01-01 00:00:05\n" + "fingerprint ", sizeof(buf2)); + test_assert(!crypto_pk_get_fingerprint(pk1, fingerprint, 1)); + strlcat(buf2, fingerprint, sizeof(buf2)); + strlcat(buf2, "\nuptime 0\n" + "bandwidth 3000 3000 3000\n", sizeof(buf2)); + strlcat(buf2, "onion-key\n", sizeof(buf2)); strlcat(buf2, pk2_str, sizeof(buf2)); strlcat(buf2, "signing-key\n", sizeof(buf2)); strlcat(buf2, pk1_str, sizeof(buf2)); - strlcat(buf2, "accept *:80\nreject 18.*:24\n\n", sizeof(buf2)); - test_assert(router_dump_router_to_string(buf, 2048, &r2, pk2)>0); + strlcat(buf2, "hidden-service-dir\n", sizeof(buf2)); + strlcat(buf2, "accept *:80\nreject 18.0.0.0/8:24\n", sizeof(buf2)); + strlcat(buf2, "router-signature\n", sizeof(buf2)); + + buf = router_dump_router_to_string(r2, pk1); + buf[strlen(buf2)] = '\0'; /* Don't compare the sig; it's never the same + * twice */ test_streq(buf, buf2); + tor_free(buf); + buf = router_dump_router_to_string(r2, pk1); cp = buf; - rp2 = router_parse_entry_from_string(&cp,1); + rp2 = router_parse_entry_from_string((const char*)cp,NULL,1,0,NULL); test_assert(rp2); - test_streq(rp2->address, r2.address); - test_eq(rp2->or_port, r2.or_port); - test_eq(rp2->dir_port, r2.dir_port); - test_eq(rp2->bandwidth, r2.bandwidth); + test_streq(rp2->address, r2->address); + test_eq(rp2->or_port, r2->or_port); + test_eq(rp2->dir_port, r2->dir_port); + test_eq(rp2->bandwidthrate, r2->bandwidthrate); + test_eq(rp2->bandwidthburst, r2->bandwidthburst); + test_eq(rp2->bandwidthcapacity, r2->bandwidthcapacity); test_assert(crypto_pk_cmp_keys(rp2->onion_pkey, pk2) == 0); test_assert(crypto_pk_cmp_keys(rp2->identity_pkey, pk1) == 0); - test_eq(rp2->exit_policy->policy_type, EXIT_POLICY_ACCEPT); - test_streq(rp2->exit_policy->string, "accept *:80"); - test_streq(rp2->exit_policy->address, "*"); - test_streq(rp2->exit_policy->port, "80"); - test_eq(rp2->exit_policy->next->policy_type, EXIT_POLICY_REJECT); - test_streq(rp2->exit_policy->next->string, "reject 18.*:24"); - test_streq(rp2->exit_policy->next->address, "18.*"); - test_streq(rp2->exit_policy->next->port, "24"); - test_assert(rp2->exit_policy->next->next == NULL); + test_eq(smartlist_len(rp2->exit_policy), 2); + + p = smartlist_get(rp2->exit_policy, 0); + test_eq(p->policy_type, ADDR_POLICY_ACCEPT); + test_assert(tor_addr_is_null(&p->addr)); + test_eq(p->maskbits, 0); + test_eq(p->prt_min, 80); + test_eq(p->prt_max, 80); + + p = smartlist_get(rp2->exit_policy, 1); + test_eq(p->policy_type, ADDR_POLICY_REJECT); + test_assert(tor_addr_eq(&p->addr, &ex2->addr)); + test_eq(p->maskbits, 8); + test_eq(p->prt_min, 24); + test_eq(p->prt_max, 24); + +#if 0 /* Okay, now for the directories. */ { fingerprint_list = smartlist_new();

1 0

[tor/maint-0.2.4] Add unit test for encoding ntor key in routerinfo
by nickm＠torproject.org 18 Apr '13

18 Apr '13

commit 4b15606fa2848f5112599865eb7b15ef2178e66a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 2 14:54:54 2013 -0400 Add unit test for encoding ntor key in routerinfo --- src/test/test_dir.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 6bcb6f0..8e498e4 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -131,6 +131,9 @@ test_dir_formats(void) r2->or_port = 9005; r2->dir_port = 0; r2->onion_pkey = crypto_pk_dup_key(pk2); + r2->onion_curve25519_pkey = tor_malloc_zero(sizeof(curve25519_public_key_t)); + curve25519_public_from_base64(r2->onion_curve25519_pkey, + "skyinAnvardNostarsNomoonNowindormistsorsnow"); r2->identity_pkey = crypto_pk_dup_key(pk1); r2->bandwidthrate = r2->bandwidthburst = r2->bandwidthcapacity = 3000; r2->exit_policy = smartlist_new(); @@ -211,6 +214,8 @@ test_dir_formats(void) strlcat(buf2, "signing-key\n", sizeof(buf2)); strlcat(buf2, pk1_str, sizeof(buf2)); strlcat(buf2, "hidden-service-dir\n", sizeof(buf2)); + strlcat(buf2, "ntor-onion-key " + "skyinAnvardNostarsNomoonNowindormistsorsnow=\n", sizeof(buf2)); strlcat(buf2, "accept *:80\nreject 18.0.0.0/8:24\n", sizeof(buf2)); strlcat(buf2, "router-signature\n", sizeof(buf2)); @@ -230,6 +235,9 @@ test_dir_formats(void) test_eq(rp2->bandwidthrate, r2->bandwidthrate); test_eq(rp2->bandwidthburst, r2->bandwidthburst); test_eq(rp2->bandwidthcapacity, r2->bandwidthcapacity); + test_memeq(rp2->onion_curve25519_pkey->public_key, + r2->onion_curve25519_pkey->public_key, + CURVE25519_PUBKEY_LEN); test_assert(crypto_pk_cmp_keys(rp2->onion_pkey, pk2) == 0); test_assert(crypto_pk_cmp_keys(rp2->identity_pkey, pk1) == 0);

1 0

[tor/maint-0.2.4] Remove a double-newline
by nickm＠torproject.org 18 Apr '13

18 Apr '13

commit 9fec0c1a95ab24f5f18d6995e30fe2111e6b7db2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 18 11:14:05 2013 -0400 Remove a double-newline --- src/common/crypto.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 93a60d8..0ababea 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1614,7 +1614,6 @@ crypto_digest_assign(crypto_digest_t *into, memcpy(into,from,sizeof(crypto_digest_t)); } - /** Given a list of strings in lst, set the len_out-byte digest * at digest_out to the hash of the concatenation of those strings, * plus the optional string append, computed with the algorithm

1 0

[tor-launcher/master] Do not close progress window when an error occurs.
by brade＠torproject.org 18 Apr '13

18 Apr '13

commit 3f6a79266e3a3019429f8c684f1124184dc9502c Author: Kathy Brade <brade(a)torproject.org> Date: Wed Apr 17 16:52:17 2013 -0400 Do not close progress window when an error occurs. Attempting to close when a modal error alert was being displayed causes exceptions inside progress window. --- src/chrome/content/progress.js | 19 +++++++++++++++---- src/chrome/content/progress.xul | 1 + src/components/tl-process.js | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index 865ddec..3be7aac 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -112,9 +112,6 @@ var gObserver = { var labelText = (statusObj.SUMMARY) ? statusObj.SUMMARY : ""; var percentComplete = (statusObj.PROGRESS) ? statusObj.PROGRESS : 0; - var desc = document.getElementById("progressDesc"); - if (desc) - desc.textContent = labelText; var meter = document.getElementById("progressMeter"); if (meter) meter.value = percentComplete; @@ -127,7 +124,21 @@ var gObserver = { window.setTimeout(function() { closeThisWindow(true); }, 250); } else if (statusObj._errorOccurred) - closeThisWindow(false); + { + if (statusObj.WARNING) + labelText = statusObj.WARNING; + + if (meter) + meter.setAttribute("hidden", true); + + var pleaseWait = document.getElementById("progressPleaseWait"); + if (pleaseWait) + pleaseWait.setAttribute("hidden", true); + } + + var desc = document.getElementById("progressDesc"); + if (labelText && desc) + desc.textContent = labelText; } }, }; diff --git a/src/chrome/content/progress.xul b/src/chrome/content/progress.xul index c5c5aca..2e59ebb 100644 --- a/src/chrome/content/progress.xul +++ b/src/chrome/content/progress.xul @@ -14,6 +14,7 @@ <dialog id="TorProgress" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" title="&torprogress.dialog.title;" + windowtype="TorLauncher:Progress" persist="screenX screenY" buttons="cancel" ondialogcancel="return onCancel();" diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 6014125..fcfbf89 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -303,7 +303,7 @@ TorProcessService.prototype = this.mTorProcess = p; this.mTorProcessStartTime = Date.now(); - this._waitForTorProcessStartup(); + this._monitorTorProcessStartup(); if (isInitialBootstrap) { @@ -342,7 +342,7 @@ TorProcessService.prototype = } }, // _startTor() - _waitForTorProcessStartup: function() + _monitorTorProcessStartup: function() { this.mControlConnDelayMS = this.kInitialControlConnDelayMS; this.mControlConnTimer = Cc["@mozilla.org/timer;1"]

1 0

[tor-launcher/master] Suppress repeated bootstrap error alerts (fix another edge case).
by brade＠torproject.org 18 Apr '13

18 Apr '13

commit 7ccb90e3f3053e3e5296eda5d7a543b696e01c10 Author: Kathy Brade <brade(a)torproject.org> Date: Wed Apr 17 14:55:00 2013 -0400 Suppress repeated bootstrap error alerts (fix another edge case). --- src/components/tl-process.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 7781caf..6014125 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -374,12 +374,12 @@ TorProcessService.prototype = if ((aStatusObj.TAG != this.mLastTorWarningPhase) || (aStatusObj.WARNING != this.mLastTorWarningText)) { + this.mLastTorWarningPhase = aStatusObj.TAG; + this.mLastTorWarningText = aStatusObj.WARNING; + var s = TorLauncherUtil.getFormattedLocalizedString( "tor_bootstrap_failed", [aStatusObj.WARNING], 1); TorLauncherUtil.showAlert(null, s); - - this.mLastTorWarningPhase = aStatusObj.TAG; - this.mLastTorWarningText = aStatusObj.WARNING; } } }

1 0

[tor/maint-0.2.4] Fix some wide lines
by nickm＠torproject.org 18 Apr '13

18 Apr '13

commit cd1cdae0fac33bca359b34dae4062fe87a351661 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 18 10:30:14 2013 -0400 Fix some wide lines --- src/or/routerparse.c | 2 +- src/test/test.c | 3 ++- src/test/test_dir.c | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 370cf26..0d535a6 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1494,7 +1494,7 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, extrainfo = tor_malloc_zero(sizeof(extrainfo_t)); extrainfo->cache_info.is_extrainfo = 1; if (cache_copy) - extrainfo->cache_info.signed_descriptor_body = tor_memdup_nulterm(s, end-s); + extrainfo->cache_info.signed_descriptor_body = tor_memdup_nulterm(s,end-s); extrainfo->cache_info.signed_descriptor_len = end-s; memcpy(extrainfo->cache_info.signed_descriptor_digest, digest, DIGEST_LEN); diff --git a/src/test/test.c b/src/test/test.c index 42aab4c..c12ba93 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -108,7 +108,8 @@ setup_directory(void) r = mkdir(temp_dir); } #else - tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d_%s", (int) getpid(), rnd32); + tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d_%s", + (int) getpid(), rnd32); r = mkdir(temp_dir, 0700); #endif if (r) { diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 849bb9e..de34b5e 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -611,7 +611,7 @@ test_dir_measured_bw_kb_cache(void) test_assert(dirserv_query_measured_bw_cache_kb(mbwl[0].node_id,NULL, NULL)); test_assert(dirserv_query_measured_bw_cache_kb(mbwl[0].node_id,&bw, NULL)); test_eq(bw, 20); - test_assert(dirserv_query_measured_bw_cache_kb(mbwl[0].node_id,NULL, &as_of)); + test_assert(dirserv_query_measured_bw_cache_kb(mbwl[0].node_id,NULL,&as_of)); test_eq(as_of, MBWC_INIT_TIME); /* Now expire it */ curr += MAX_MEASUREMENT_AGE + 1; @@ -619,7 +619,7 @@ test_dir_measured_bw_kb_cache(void) /* Check that the cache is empty */ test_eq(dirserv_get_measured_bw_cache_size(), 0); /* Check that we can't retrieve it */ - test_assert(!dirserv_query_measured_bw_cache_kb(mbwl[0].node_id, NULL, NULL)); + test_assert(!dirserv_query_measured_bw_cache_kb(mbwl[0].node_id, NULL,NULL)); /* Try caching a few things now */ dirserv_cache_measured_bw(&(mbwl[0]), curr); test_eq(dirserv_get_measured_bw_cache_size(), 1); @@ -2050,7 +2050,7 @@ test_consensus_for_umbw(networkstatus_t *con, time_t now) test_assert(con); test_assert(!con->cert); - /* test_assert(con->consensus_method >= MIN_METHOD_TO_CLIP_UNMEASURED_BW_KB); */ + // test_assert(con->consensus_method >= MIN_METHOD_TO_CLIP_UNMEASURED_BW_KB); test_assert(con->consensus_method >= 16); test_eq(4, smartlist_len(con->routerstatus_list)); /* There should be four listed routers; all voters saw the same in this */ @@ -2176,8 +2176,8 @@ test_dir_clip_unmeasured_bw_kb(void) } /** - * This version of test_dir_clip_unmeasured_bw_kb() uses a non-default choice of - * clip bandwidth. + * This version of test_dir_clip_unmeasured_bw_kb() uses a non-default choice + * of clip bandwidth. */ static void

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 18 Apr '13

18 Apr '13

commit b127003be24a622e46ba28b236d01110a0a9447b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 18 14:16:19 2013 +0000 Update translations for torbirdy_completed --- da/torbirdy.properties | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/da/torbirdy.properties b/da/torbirdy.properties new file mode 100644 index 0000000..f14b000 --- /dev/null +++ b/da/torbirdy.properties @@ -0,0 +1,19 @@ +torbirdy.name=TorBirdy + +torbirdy.enabled.tor=TorBirdy aktiveret\: Tor +torbirdy.enabled.jondo=TorBirdy aktiveret\: JonDo +torbirdy.enabled.custom=TorBirdy aktiveret\: Tilpasset proxy +torbirdy.enabled.torification=TorBirdy aktiveret\: Gennemsigtig torifikation +torbirdy.enabled.whonix=TorBirdy aktiveret\: Whonix +torbirdy.disabled=TorBirdy\: Deaktiveret\! + +torbirdy.email.prompt=TorBirdy har deaktiveret Thunderbirds automatiske konfigurationsguide for at beskytte din anonymitet.\n\nDen anbefalede sikkerhedsindstilling for %S er blevet sat.\n\nDu kan nu konfigurere de andre kontoindstillinger manuelt. + +torbirdy.email.advanced=Bemærk venligst at ændring af de avancerede indstillinger for TorBirdy IKKE er anbefalet.\n\nDu bør kun fortsætte, hvis du er sikker på hvad du gør. +torbirdy.email.advanced.nextwarning=Vis denne advarsel næste gang +torbirdy.email.advanced.title=TorBirdy - avancerede indstillinger + +torbirdy.restart=For at tidszonepræferencen træder i kraft, så luk venligst Thunderbird og start den igen. + +torbirdy.firstrun=Du kører nu TorBirdy.\n\nFor at beskytte din anonymitet, vil TorBirdy med tvang benytte sine egne Thunderbirdindstillinger, så de forhindres i at blive ændret af dig eller eventuelle tilføjelser. Der er nogle ændringer som kan ændres og disse tilgås via TorBirdys dialog for præferencer. Når TorBirdy afinstalleres eller deaktiveres, bliver alle indstillinger programmet bruger nulstillet til deres standardværdi (værdierne før TorBirdys installation).\n\nHvis du er ny bruger, så anbefales det at du læser TorBirdys hjemmeside for at forstå hvad vi forsøger at opnå med TorBirdy for vores brugere. +torbirdy.website=https\://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 18 Apr '13

18 Apr '13

commit 41fa769e8d26fd9485c622b9d44bb309e57c6fe5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 18 14:16:16 2013 +0000 Update translations for torbirdy --- da/torbirdy.properties | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/da/torbirdy.properties b/da/torbirdy.properties new file mode 100644 index 0000000..f14b000 --- /dev/null +++ b/da/torbirdy.properties @@ -0,0 +1,19 @@ +torbirdy.name=TorBirdy + +torbirdy.enabled.tor=TorBirdy aktiveret\: Tor +torbirdy.enabled.jondo=TorBirdy aktiveret\: JonDo +torbirdy.enabled.custom=TorBirdy aktiveret\: Tilpasset proxy +torbirdy.enabled.torification=TorBirdy aktiveret\: Gennemsigtig torifikation +torbirdy.enabled.whonix=TorBirdy aktiveret\: Whonix +torbirdy.disabled=TorBirdy\: Deaktiveret\! + +torbirdy.email.prompt=TorBirdy har deaktiveret Thunderbirds automatiske konfigurationsguide for at beskytte din anonymitet.\n\nDen anbefalede sikkerhedsindstilling for %S er blevet sat.\n\nDu kan nu konfigurere de andre kontoindstillinger manuelt. + +torbirdy.email.advanced=Bemærk venligst at ændring af de avancerede indstillinger for TorBirdy IKKE er anbefalet.\n\nDu bør kun fortsætte, hvis du er sikker på hvad du gør. +torbirdy.email.advanced.nextwarning=Vis denne advarsel næste gang +torbirdy.email.advanced.title=TorBirdy - avancerede indstillinger + +torbirdy.restart=For at tidszonepræferencen træder i kraft, så luk venligst Thunderbird og start den igen. + +torbirdy.firstrun=Du kører nu TorBirdy.\n\nFor at beskytte din anonymitet, vil TorBirdy med tvang benytte sine egne Thunderbirdindstillinger, så de forhindres i at blive ændret af dig eller eventuelle tilføjelser. Der er nogle ændringer som kan ændres og disse tilgås via TorBirdys dialog for præferencer. Når TorBirdy afinstalleres eller deaktiveres, bliver alle indstillinger programmet bruger nulstillet til deres standardværdi (værdierne før TorBirdys installation).\n\nHvis du er ny bruger, så anbefales det at du læser TorBirdys hjemmeside for at forstå hvad vi forsøger at opnå med TorBirdy for vores brugere. +torbirdy.website=https\://trac.torproject.org/projects/tor/wiki/torbirdy

1 0