- tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug2474'
by nickm＠torproject.org 24 Nov '11

24 Nov '11

commit f067067ee66e104b2d1e97fb881bf6d2277ea589 Merge: 3890c81 2b4d4ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 23 17:14:54 2011 -0500 Merge branch 'bug2474' Had to resolve conflicts wrt the " (using bufferevents)" addition to the startup string. Conflicts: src/or/main.c changes/bug2474 | 5 +++++ src/or/main.c | 20 +++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --cc src/or/main.c index c1a7015,f6f47db..7008d38 --- a/src/or/main.c +++ b/src/or/main.c @@@ -2235,17 -1885,21 +2235,27 @@@ tor_init(int argc, char *argv[] default: add_temp_log(LOG_NOTICE); } + quiet_level = quiet; - log(LOG_NOTICE, LD_GENERAL, "Tor v%s%s. This is experimental software. " - "Do not rely on it for strong anonymity. (Running on %s)", get_version(), + { + const char *version = get_version(); - log_notice(LD_GENERAL, "Tor v%s running on %s.", version, get_uname()); ++ log_notice(LD_GENERAL, "Tor v%s%s running on %s.", version, +#ifdef USE_BUFFEREVENTS - " (with bufferevents)", ++ " (with bufferevents)", +#else - "", ++ "", +#endif - get_uname()); ++ get_uname()); + + log_notice(LD_GENERAL, "WARNING: Tor can't help you if you use it wrong. " + "Learn how to be safe at " + "https://www.torproject.org/download/download#warning"); + + if (strstr(version, "alpha") || strstr(version, "beta")) + log_notice(LD_GENERAL, "This version is not a stable Tor release. " + "Expect more bugs than usual."); + } - if (network_init()<0) { log_err(LD_BUG,"Error initializing network; exiting."); return -1;

1 0

[tor/master] Tweak the startup message to be more helpful
by nickm＠torproject.org 24 Nov '11

24 Nov '11

commit 4f7587a5ed64b2b5894157103d2d50f543434d64 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 22:00:22 2011 -0400 Tweak the startup message to be more helpful Instead of just saying "boogity boogity!" let's actually warn people that they need to configure stuff right to be safe, and point them at instructions for how to do that. Resolves bug 2474. --- changes/bug2474 | 5 +++++ src/or/main.c | 16 +++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/changes/bug2474 b/changes/bug2474 new file mode 100644 index 0000000..02d3eb7 --- /dev/null +++ b/changes/bug2474 @@ -0,0 +1,5 @@ + o Minor features + - Try to make the introductory warning message that Tor prints on + startup more useful for actually finding help and information. + Resolves bug2474. + diff --git a/src/or/main.c b/src/or/main.c index a26be39..867dd60 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1886,9 +1886,19 @@ tor_init(int argc, char *argv[]) add_temp_log(LOG_NOTICE); } - log(LOG_NOTICE, LD_GENERAL, "Tor v%s. This is experimental software. " - "Do not rely on it for strong anonymity. (Running on %s)",get_version(), - get_uname()); + { + const char *version = get_version(); + log_notice(LD_GENERAL, "Tor v%s running on %s.", version, get_uname()); + + log_notice(LD_GENERAL, "WARNING: Tor can't help you if you use it wrong. " + "Learn how to be safe at " + "https://www.torproject.org/download/download#warning"); + + if (strstr(version, "alpha")) + log_notice(LD_GENERAL, "This is an alpha release; do not rely on it for " + "strong anonymity."); + } + if (network_init()<0) { log_err(LD_BUG,"Error initializing network; exiting.");

1 0

[tor/master] Tweak the "this is not a stable release" warning some more
by nickm＠torproject.org 24 Nov '11

24 Nov '11

commit 2b4d4ffa8f2d893cf5df1480aa2db86e75e8292a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 23 17:09:36 2011 -0500 Tweak the "this is not a stable release" warning some more --- src/or/main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 867dd60..f6f47db 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1894,9 +1894,9 @@ tor_init(int argc, char *argv[]) "Learn how to be safe at " "https://www.torproject.org/download/download#warning"); - if (strstr(version, "alpha")) - log_notice(LD_GENERAL, "This is an alpha release; do not rely on it for " - "strong anonymity."); + if (strstr(version, "alpha") || strstr(version, "beta")) + log_notice(LD_GENERAL, "This version is not a stable Tor release. " + "Expect more bugs than usual."); }

1 0

[torspec/master] update bandwidth guarantee threshold for Fast flag (ticket 4489)
by arma＠torproject.org 24 Nov '11

24 Nov '11

commit 5808b4050545afd0e0ad4fa8222dfc0b3e23dc29 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Nov 23 16:39:48 2011 -0500 update bandwidth guarantee threshold for Fast flag (ticket 4489) --- dir-spec.txt | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 9a22323..b4db02e 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1486,11 +1486,12 @@ [XXXX what happens when we have less than 4 days of MTBF info.] "Exit" -- A router is called an 'Exit' iff it allows exits to at - least two of the ports 80, 443, and 6667 and allows exits to at - least one /8 address space. + least two of the ports 80, 443, and 6667 and allows exits to at + least one /8 address space. "Fast" -- A router is 'Fast' if it is active, and its bandwidth is - either in the top 7/8ths for known active routers or at least 20KB/s. + either in the top 7/8ths for known active routers or at least some + minimum (20KB/s until 0.2.3.7-alpha, and 100KB/s after that). "Guard" -- A router is a possible 'Guard' if its Weighted Fractional Uptime is at least the median for "familiar" active routers, and if

1 0

[tor/master] Merge remote-tracking branch 'public/bug4230' into maint-0.2.2
by nickm＠torproject.org 24 Nov '11

24 Nov '11

commit fbf1c5ee79490577ec0b8c68338ba4f872e993b4 Merge: 841247a e1c6431 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 23 16:22:26 2011 -0500 Merge remote-tracking branch 'public/bug4230' into maint-0.2.2 changes/bug4230 | 5 +++++ src/common/container.c | 19 ++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-)

1 0

[tor/master] Correct the handling of overflow behavior in smartlist_ensure_capacity
by nickm＠torproject.org 24 Nov '11

24 Nov '11

commit e1c6431e42bc6b5619c78008cbe92730ead57bbf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 9 12:08:28 2011 -0500 Correct the handling of overflow behavior in smartlist_ensure_capacity The old behavior was susceptible to the compiler optimizing out our assertion check, *and* could still overflow size_t on 32-bit systems even when it did work. --- changes/bug4230 | 5 +++++ src/common/container.c | 19 ++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/changes/bug4230 b/changes/bug4230 new file mode 100644 index 0000000..c1ba584 --- /dev/null +++ b/changes/bug4230 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Resolve an integer overflow bug in smartlist_ensure_capacity. + Fixes bug 4230; bugfix on Tor 0.1.0.1-rc. Based on a patch by + Mansour Moufid. + diff --git a/src/common/container.c b/src/common/container.c index c741eb0..edfcd97 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -61,13 +61,22 @@ smartlist_clear(smartlist_t *sl) static INLINE void smartlist_ensure_capacity(smartlist_t *sl, int size) { +#if SIZEOF_SIZE_T > SIZEOF_INT +#define MAX_CAPACITY (INT_MAX) +#else +#define MAX_CAPACITY (int)((SIZE_MAX / (sizeof(void*)))) +#endif if (size > sl->capacity) { - int higher = sl->capacity * 2; - while (size > higher) - higher *= 2; - tor_assert(higher > 0); /* detect overflow */ + int higher = sl->capacity; + if (PREDICT_UNLIKELY(size > MAX_CAPACITY/2)) { + tor_assert(size <= MAX_CAPACITY); + higher = MAX_CAPACITY; + } else { + while (size > higher) + higher *= 2; + } sl->capacity = higher; - sl->list = tor_realloc(sl->list, sizeof(void*)*sl->capacity); + sl->list = tor_realloc(sl->list, sizeof(void*)*((size_t)sl->capacity)); } }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 24 Nov '11

24 Nov '11

commit 3890c81e7c4eaa3350fe569dbc2fbf97e824e4c0 Merge: 281aa2e fbf1c5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 23 16:28:18 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4230 | 5 +++++ src/common/container.c | 19 ++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.2.2] Correct the handling of overflow behavior in smartlist_ensure_capacity
by nickm＠torproject.org 24 Nov '11

24 Nov '11

commit e1c6431e42bc6b5619c78008cbe92730ead57bbf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 9 12:08:28 2011 -0500 Correct the handling of overflow behavior in smartlist_ensure_capacity The old behavior was susceptible to the compiler optimizing out our assertion check, *and* could still overflow size_t on 32-bit systems even when it did work. --- changes/bug4230 | 5 +++++ src/common/container.c | 19 ++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/changes/bug4230 b/changes/bug4230 new file mode 100644 index 0000000..c1ba584 --- /dev/null +++ b/changes/bug4230 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Resolve an integer overflow bug in smartlist_ensure_capacity. + Fixes bug 4230; bugfix on Tor 0.1.0.1-rc. Based on a patch by + Mansour Moufid. + diff --git a/src/common/container.c b/src/common/container.c index c741eb0..edfcd97 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -61,13 +61,22 @@ smartlist_clear(smartlist_t *sl) static INLINE void smartlist_ensure_capacity(smartlist_t *sl, int size) { +#if SIZEOF_SIZE_T > SIZEOF_INT +#define MAX_CAPACITY (INT_MAX) +#else +#define MAX_CAPACITY (int)((SIZE_MAX / (sizeof(void*)))) +#endif if (size > sl->capacity) { - int higher = sl->capacity * 2; - while (size > higher) - higher *= 2; - tor_assert(higher > 0); /* detect overflow */ + int higher = sl->capacity; + if (PREDICT_UNLIKELY(size > MAX_CAPACITY/2)) { + tor_assert(size <= MAX_CAPACITY); + higher = MAX_CAPACITY; + } else { + while (size > higher) + higher *= 2; + } sl->capacity = higher; - sl->list = tor_realloc(sl->list, sizeof(void*)*sl->capacity); + sl->list = tor_realloc(sl->list, sizeof(void*)*((size_t)sl->capacity)); } }

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'public/bug4230' into maint-0.2.2
by nickm＠torproject.org 24 Nov '11

24 Nov '11

commit fbf1c5ee79490577ec0b8c68338ba4f872e993b4 Merge: 841247a e1c6431 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 23 16:22:26 2011 -0500 Merge remote-tracking branch 'public/bug4230' into maint-0.2.2 changes/bug4230 | 5 +++++ src/common/container.c | 19 ++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-)

1 0

[tor-cloud/master] How to stop/terminate an instance, solves #4540
by runa＠torproject.org 24 Nov '11

24 Nov '11

commit 51f28340f7178c5238126255d8e849efe787109a Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Wed Nov 23 19:48:29 2011 +0000 How to stop/terminate an instance, solves #4540 --- html/index.html | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/html/index.html b/html/index.html index 9693034..5645f9e 100644 --- a/html/index.html +++ b/html/index.html @@ -289,26 +289,33 @@ ubuntu as the username if you wish to connect to your server via SSH. - 5. What's in the Tor configuration file? + 5. How do I stop or terminate the instance? + To stop or terminate the instance, log on to the AWS Management + Console, find your instance, right click on it and choose either + "Stop" or "Terminate". "Stop" will just shutdown the instance as + normal and will allow you to start it up again later. "Terminate" + will delete the instance from your AWS account. + + 6. What's in the Tor configuration file? The Tor configuration file that the images have been configured with can be found <a href="https://cloud.torproject.org/torrc.txt">here</a>. - 6. Will the images automatically download and install package updates? + 7. Will the images automatically download and install package updates? Yes, the images have all been configured with the <a href="https://help.ubuntu.com/community/AutomaticSecurityUpdates">unattended-upgrades</a> package. This means that your system will automatically download and install updates. - 7. Will you let me know when you publish new images? + 8. Will you let me know when you publish new images? New cloud images will be announced on <a href="https://twitter.com/torproject">Twitter</a>, <a href="https://identi.ca/torproject">identi.ca</a>, <a href="https://blog.torproject.org">our blog</a> and on the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk</a> mailing list. - 8. Where do I report a bug I am encountering? + 9. Where do I report a bug I am encountering? If you think the bug you have found is specific to the Tor Cloud images we provide, please <a href="https://trac.torproject.org">file a bug</a> or send an email to help AT rt.torproject.org. - 9. Is there an IRC channel where I can ask about Tor Cloud? + 10. Is there an IRC channel where I can ask about Tor Cloud? Yes, simply join #tor on irc.oftc.net and ask your question. It may take a while before we get back to you, so please be patient. - 10. I have a question that is not answered here, what do I do? + 11. I have a question that is not answered here, what do I do? Please send an email to help AT rt.torproject.org. </div>

1 0