- tor-commits - lists.torproject.org

[tor/release-0.2.2] Revert "Simplest fix to bug2402: do not include SVN versions"
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit 671318c3a84657acc8b97cf59871489065264ece Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 10:47:25 2011 -0500 Revert "Simplest fix to bug2402: do not include SVN versions" This reverts commit a1073ee956021ead19d30c2151510dbaced416a8. Apparently, we totally misunderstood how the debian packages were using microrevisions. Better fix that! --- changes/bug2402 | 4 ---- src/or/config.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/changes/bug2402 b/changes/bug2402 deleted file mode 100644 index f16f677..0000000 --- a/changes/bug2402 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (build) - - Do not include Git version tags as though they were SVN tags when - generating a tarball from inside a repository that has switched between - branches. Bugfix on 0.2.1.15-rc; fixes bug 2402. diff --git a/src/or/config.c b/src/or/config.c index 209a92d..8397b23 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -827,7 +827,16 @@ static char *_version = NULL; const char * get_version(void) { - return VERSION; + if (_version == NULL) { + if (strlen(tor_svn_revision)) { + size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8; + _version = tor_malloc(len); + tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision); + } else { + _version = tor_strdup(VERSION); + } + } + return _version; } /** Release additional memory allocated in options

1 0

[tor/release-0.2.2] retroactively add a changelog entry
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit 645920542684c28d24b70529486210889434bcc9 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Apr 8 16:43:10 2011 -0400 retroactively add a changelog entry --- ChangeLog | 1 + changes/geoip-apr2011 | 3 --- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c9ccc3..70afe71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ Changes in version 0.2.2.24-alpha - 2011-04-08 - Use computed circuit-build timeouts to decide when to launch parallel introduction circuits for hidden services. (Previously, we would retry after 15 seconds.) + - Update to the April 1 2011 Maxmind GeoLite Country database. o Packaging fixes: - Create the /var/run/tor directory on startup on OpenSUSE if it is diff --git a/changes/geoip-apr2011 b/changes/geoip-apr2011 deleted file mode 100644 index c38f8ae..0000000 --- a/changes/geoip-apr2011 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the April 1 2011 Maxmind GeoLite Country database. -

1 0

[tor/release-0.2.2] add a blurb for 0.2.2.24-alpha
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit c111adb5fe757ea9baf9aaca151af7e8cd5e5808 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Apr 8 16:30:39 2011 -0400 add a blurb for 0.2.2.24-alpha --- ChangeLog | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d47e3d..9c9ccc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,10 @@ -Changes in version 0.2.2.24-alpha - 2011-04-0? +Changes in version 0.2.2.24-alpha - 2011-04-08 + Tor 0.2.2.24-alpha fixes a variety of bugs, including a big bug that + prevented Tor clients from effectively using "multihomed" bridges, + that is, bridges that listen on multiple ports or IP addresses so users + can continue to use some of their addresses even if others get blocked. + o Major bugfixes: - - Directory authorities now use data collected from their own - uptime observations when choosing whether to assign the HSDir flag - to relays, instead of trusting the uptime value the relay reports in - its descriptor. This change helps prevent an attack where a small - set of nodes with frequently-changing identity keys can blackhole - a hidden service. (Only authorities need upgrade; others will be - fine once they do.) Bugfix on 0.2.0.10-alpha; fixes bug 2709. - Fix a bug where bridge users who configure the non-canonical address of a bridge automatically switch to its canonical address. If a bridge listens at more than one address, it should be @@ -18,6 +16,13 @@ Changes in version 0.2.2.24-alpha - 2011-04-0? to use bridge A if it's still reachable. While this behavior is a feature if your goal is connectivity, in some scenarios it's a dangerous bug. Bugfix on Tor 0.2.0.1-alpha; fixes bug 2511. + - Directory authorities now use data collected from their own + uptime observations when choosing whether to assign the HSDir flag + to relays, instead of trusting the uptime value the relay reports in + its descriptor. This change helps prevent an attack where a small + set of nodes with frequently-changing identity keys can blackhole + a hidden service. (Only authorities need upgrade; others will be + fine once they do.) Bugfix on 0.2.0.10-alpha; fixes bug 2709. o Minor bugfixes: - When we restart our relay, we might get a successful connection

1 0

[tor/master] Free circuits_for_buffer_stats on shutdown
by nickm＠torproject.org 08 Apr '11

08 Apr '11

commit 403b6cfdedee7ebc8fe0b5d1c187e8ae3611aec1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 7 14:59:28 2011 -0400 Free circuits_for_buffer_stats on shutdown --- src/or/rephist.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index 74e156f..9b7eefe 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2545,5 +2545,11 @@ rep_hist_free_all(void) tor_free(exit_streams); built_last_stability_doc_at = 0; predicted_ports_free(); + if (circuits_for_buffer_stats) { + SMARTLIST_FOREACH(circuits_for_buffer_stats, circ_buffer_stats_t *, s, + tor_free(s)); + smartlist_free(circuits_for_buffer_stats); + circuits_for_buffer_stats = NULL; + } }

1 0

[tor/master] Fix up some cell-queue stats issues in rephist.c
by nickm＠torproject.org 08 Apr '11

08 Apr '11

commit 71fb2af62c0a60fee94f984b782531a5d492b055 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 7 14:56:50 2011 -0400 Fix up some cell-queue stats issues in rephist.c - Document the structure and variables. - Make circuits_for_buffer_stats into a static variable. - Don't die horribly if interval_length is 0. - Remove the unused local_circ_id field. - Reorder the fields of circ_buffer_stats_t for cleaner alignment layout. --- src/or/rephist.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index e56ce9e..74e156f 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2330,14 +2330,19 @@ rep_hist_buffer_stats_init(time_t now) start_of_buffer_stats_interval = now; } +/** Statistics from a single circuit. Collected when the circuit closes, or + * when we flush statistics to disk. */ typedef struct circ_buffer_stats_t { - uint32_t processed_cells; + /** Average number of cells in the circuit's queue */ double mean_num_cells_in_queue; + /** Average time a cell waits in the queue. */ double mean_time_cells_in_queue; - uint32_t local_circ_id; + /** Total number of cells sent over this circuit */ + uint32_t processed_cells; } circ_buffer_stats_t; -smartlist_t *circuits_for_buffer_stats = NULL; +/** List of circ_buffer_stats_t. */ +static smartlist_t *circuits_for_buffer_stats = NULL; /** Remember cell statistics for circuit circ at time * end_of_interval and reset cell counters in case the circuit @@ -2361,6 +2366,8 @@ rep_hist_buffer_stats_add_circ(circuit_t *circ, time_t end_of_interval) circ->timestamp_created.tv_sec : start_of_buffer_stats_interval; interval_length = (int) (end_of_interval - start_of_interval); + if (interval_length <= 0) + return; stat = tor_malloc_zero(sizeof(circ_buffer_stats_t)); stat->processed_cells = orcirc->processed_cells; /* 1000.0 for s -> ms; 2.0 because of app-ward and exit-ward queues */

1 0

[tor/master] Free pending_cb_messages on exit
by nickm＠torproject.org 08 Apr '11

08 Apr '11

commit 1be12213857e3c5068107f4df047cea03b6462e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 7 15:25:33 2011 -0400 Free pending_cb_messages on exit --- src/common/log.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index 28d0029..d14563c 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -363,7 +363,7 @@ logv(int severity, log_domain_mask_t domain, const char *funcname, continue; } else if (lf->callback) { if (domain & LD_NOCB) { - if (!callbacks_deferred) { + if (!callbacks_deferred && pending_cb_messages) { pending_cb_message_t *msg = tor_malloc(sizeof(pending_cb_message_t)); msg->severity = severity; msg->domain = domain; @@ -512,9 +512,12 @@ void logs_free_all(void) { logfile_t *victim, *next; + smartlist_t *messages; LOCK_LOGS(); next = logfiles; logfiles = NULL; + messages = pending_cb_messages; + pending_cb_messages = NULL; UNLOCK_LOGS(); while (next) { victim = next; @@ -524,6 +527,12 @@ logs_free_all(void) } tor_free(appname); + SMARTLIST_FOREACH(messages, pending_cb_message_t *, msg, { + tor_free(msg->msg); + tor_free(msg); + }); + smartlist_free(messages); + /* We _could_ destroy the log mutex here, but that would screw up any logs * that happened between here and the end of execution. */ }

1 0

[tor/master] Merge branch 'bug2373' into maint-0.2.2
by nickm＠torproject.org 08 Apr '11

08 Apr '11

commit e247705afefaa0f32ccbc43185f98fc65f041af1 Merge: 70e0291 1be1221 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 8 13:35:26 2011 -0400 Merge branch 'bug2373' into maint-0.2.2 src/common/log.c | 11 ++++++++++- src/or/rephist.c | 19 ++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-)

1 0

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

08 Apr '11

commit 99c2bfe76b48f8a142682c2729236d5e4e63ec25 Merge: 85ac832 e247705 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 8 13:37:57 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/rephist.c src/common/log.c | 11 ++++++++++- src/or/rephist.c | 19 +++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --cc src/or/rephist.c index 56a3d1d,9b7eefe..d6b4a03 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@@ -2748,6 -2545,11 +2756,13 @@@ rep_hist_free_all(void tor_free(exit_streams); built_last_stability_doc_at = 0; predicted_ports_free(); + bidi_map_free(); ++ + if (circuits_for_buffer_stats) { + SMARTLIST_FOREACH(circuits_for_buffer_stats, circ_buffer_stats_t *, s, + tor_free(s)); + smartlist_free(circuits_for_buffer_stats); + circuits_for_buffer_stats = NULL; + } }

1 0

[tor/maint-0.2.2] Fix up some cell-queue stats issues in rephist.c
by nickm＠torproject.org 08 Apr '11

08 Apr '11

commit 71fb2af62c0a60fee94f984b782531a5d492b055 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 7 14:56:50 2011 -0400 Fix up some cell-queue stats issues in rephist.c - Document the structure and variables. - Make circuits_for_buffer_stats into a static variable. - Don't die horribly if interval_length is 0. - Remove the unused local_circ_id field. - Reorder the fields of circ_buffer_stats_t for cleaner alignment layout. --- src/or/rephist.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index e56ce9e..74e156f 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2330,14 +2330,19 @@ rep_hist_buffer_stats_init(time_t now) start_of_buffer_stats_interval = now; } +/** Statistics from a single circuit. Collected when the circuit closes, or + * when we flush statistics to disk. */ typedef struct circ_buffer_stats_t { - uint32_t processed_cells; + /** Average number of cells in the circuit's queue */ double mean_num_cells_in_queue; + /** Average time a cell waits in the queue. */ double mean_time_cells_in_queue; - uint32_t local_circ_id; + /** Total number of cells sent over this circuit */ + uint32_t processed_cells; } circ_buffer_stats_t; -smartlist_t *circuits_for_buffer_stats = NULL; +/** List of circ_buffer_stats_t. */ +static smartlist_t *circuits_for_buffer_stats = NULL; /** Remember cell statistics for circuit circ at time * end_of_interval and reset cell counters in case the circuit @@ -2361,6 +2366,8 @@ rep_hist_buffer_stats_add_circ(circuit_t *circ, time_t end_of_interval) circ->timestamp_created.tv_sec : start_of_buffer_stats_interval; interval_length = (int) (end_of_interval - start_of_interval); + if (interval_length <= 0) + return; stat = tor_malloc_zero(sizeof(circ_buffer_stats_t)); stat->processed_cells = orcirc->processed_cells; /* 1000.0 for s -> ms; 2.0 because of app-ward and exit-ward queues */

1 0

[tor/maint-0.2.2] Free circuits_for_buffer_stats on shutdown
by nickm＠torproject.org 08 Apr '11

08 Apr '11

commit 403b6cfdedee7ebc8fe0b5d1c187e8ae3611aec1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 7 14:59:28 2011 -0400 Free circuits_for_buffer_stats on shutdown --- src/or/rephist.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index 74e156f..9b7eefe 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2545,5 +2545,11 @@ rep_hist_free_all(void) tor_free(exit_streams); built_last_stability_doc_at = 0; predicted_ports_free(); + if (circuits_for_buffer_stats) { + SMARTLIST_FOREACH(circuits_for_buffer_stats, circ_buffer_stats_t *, s, + tor_free(s)); + smartlist_free(circuits_for_buffer_stats); + circuits_for_buffer_stats = NULL; + } }

1 0