September 2012 - tor-commits - lists.torproject.org

[tor/master] omit the first heartbeat message (resolves ticket 6758)
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit e964f811437290ada91b62b44efb5caf7b491da4 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Sep 3 18:13:35 2012 -0400 omit the first heartbeat message (resolves ticket 6758) --- changes/feature6758 | 5 +++++ src/or/main.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/feature6758 b/changes/feature6758 new file mode 100644 index 0000000..049f05e --- /dev/null +++ b/changes/feature6758 @@ -0,0 +1,5 @@ + o Minor features: + - Omit the first heartbeat log message, because it never has anything + useful to say, and it clutters up the bootstrapping messages. + Resolves ticket 6758. + diff --git a/src/or/main.c b/src/or/main.c index 20a1e08..da79cbd 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1561,7 +1561,8 @@ run_scheduled_events(time_t now) /** 12. write the heartbeat message */ if (options->HeartbeatPeriod && time_to_next_heartbeat <= now) { - log_heartbeat(now); + if (time_to_next_heartbeat) /* don't log the first heartbeat */ + log_heartbeat(now); time_to_next_heartbeat = now+options->HeartbeatPeriod; } }

1 0

[tor/master] Merge remote-tracking branch 'arma/feature6758'
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit 3da9a14f1c8b02215db1a14e31b6d5de4074998b Merge: 978a225 e964f81 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 4 10:16:15 2012 -0400 Merge remote-tracking branch 'arma/feature6758' changes/feature6758 | 5 +++++ src/or/main.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/master] quiet "I learned some more directory information" on startup
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit 3ea37e5faae2eefa2dda2136f43fbf677325e080 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Sep 3 19:49:44 2012 -0400 quiet "I learned some more directory information" on startup Reserve it for when new directory information arrives in response to a fetch. Resolves ticket 6760. --- changes/feature6760 | 6 ++++++ src/or/main.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/changes/feature6760 b/changes/feature6760 new file mode 100644 index 0000000..cd94d4e --- /dev/null +++ b/changes/feature6760 @@ -0,0 +1,6 @@ + o Minor features: + - Don't log "I learned some more directory information" when we're + reading cached directory information. Reserve it for when new + directory information arrives in response to a fetch. Resolves + ticket 6760. + diff --git a/src/or/main.c b/src/or/main.c index 20a1e08..f3b781e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -953,7 +953,8 @@ directory_info_has_arrived(time_t now, int from_cache) const or_options_t *options = get_options(); if (!router_have_minimum_dir_info()) { - int quiet = directory_too_idle_to_fetch_descriptors(options, now); + int quiet = from_cache || + directory_too_idle_to_fetch_descriptors(options, now); log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR, "I learned some more directory information, but not enough to " "build a circuit: %s", get_dir_info_status_string());

1 0

[tor/master] Merge remote-tracking branch 'arma/feature6760'
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit 978a2251f33416a95d5c2d8c8a844d1777d20429 Merge: 0a2fcc5 3ea37e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 4 10:14:55 2012 -0400 Merge remote-tracking branch 'arma/feature6760' changes/feature6760 | 6 ++++++ src/or/main.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] Give build-obfsproxy target proper deps and CFLAGS
by erinn＠torproject.org 04 Sep '12

04 Sep '12

commit d78759c2236c5170391d0665538a324227f70e3d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Sep 4 15:25:42 2012 +0200 Give build-obfsproxy target proper deps and CFLAGS This is required for builds of the non-native architecture, and also to make sure calling make build-obfsproxy actually does the right thing. --- build-scripts/osx-alpha.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 69b6708..58a8ce1 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -117,7 +117,8 @@ TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VE TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --disable-dependency-tracking $(CC) -build-obfsproxy: $(OBFSPROXY_DIR) +OBFSPROXY_CFLAGS="-arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION)" +build-obfsproxy: build-zlib build-openssl build-libevent $(OBFSPROXY_DIR) ifeq ($(USE_OBFSPROXY),1) cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR) cd $(OBFSPROXY_DIR) && make

1 0

[torbrowser/master] Merge branch 'maint-2.3'
by erinn＠torproject.org 04 Sep '12

04 Sep '12

commit 4bbf121d16d4e1e4a06211db32d2cb02e2313c8f Merge: 0220d0a 196ebd2 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Sep 4 14:46:10 2012 +0100 Merge branch 'maint-2.3' build-scripts/osx-alpha.mk | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

1 0

[torbrowser/maint-2.3] Link openssl and libevent statically with obfsproxy
by erinn＠torproject.org 04 Sep '12

04 Sep '12

commit 196ebd20de78c11065b79e0e98e6e06ce8779761 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Sep 4 15:26:42 2012 +0200 Link openssl and libevent statically with obfsproxy --- build-scripts/osx-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 58a8ce1..1c77620 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -120,7 +120,7 @@ TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(B OBFSPROXY_CFLAGS="-arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION)" build-obfsproxy: build-zlib build-openssl build-libevent $(OBFSPROXY_DIR) ifeq ($(USE_OBFSPROXY),1) - cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR) + cd $(OBFSPROXY_DIR) && CFLAGS=$(OBFSPROXY_CFLAGS) libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="$(BUILT_DIR)/lib/libevent.a" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="$(BUILT_DIR)/lib/libssl.a $(BUILT_DIR)/lib/libz.a $(BUILT_DIR)/lib/libcrypto.a" ./configure --prefix=$(BUILT_DIR) cd $(OBFSPROXY_DIR) && make cd $(OBFSPROXY_DIR) && make install endif

1 0

[torbrowser/master] Give build-obfsproxy target proper deps and CFLAGS
by erinn＠torproject.org 04 Sep '12

04 Sep '12

commit d78759c2236c5170391d0665538a324227f70e3d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Sep 4 15:25:42 2012 +0200 Give build-obfsproxy target proper deps and CFLAGS This is required for builds of the non-native architecture, and also to make sure calling make build-obfsproxy actually does the right thing. --- build-scripts/osx-alpha.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 69b6708..58a8ce1 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -117,7 +117,8 @@ TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VE TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --disable-dependency-tracking $(CC) -build-obfsproxy: $(OBFSPROXY_DIR) +OBFSPROXY_CFLAGS="-arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION)" +build-obfsproxy: build-zlib build-openssl build-libevent $(OBFSPROXY_DIR) ifeq ($(USE_OBFSPROXY),1) cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR) cd $(OBFSPROXY_DIR) && make

1 0

[torbrowser/master] Link openssl and libevent statically with obfsproxy
by erinn＠torproject.org 04 Sep '12

04 Sep '12

commit 196ebd20de78c11065b79e0e98e6e06ce8779761 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Sep 4 15:26:42 2012 +0200 Link openssl and libevent statically with obfsproxy --- build-scripts/osx-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 58a8ce1..1c77620 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -120,7 +120,7 @@ TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(B OBFSPROXY_CFLAGS="-arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION)" build-obfsproxy: build-zlib build-openssl build-libevent $(OBFSPROXY_DIR) ifeq ($(USE_OBFSPROXY),1) - cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR) + cd $(OBFSPROXY_DIR) && CFLAGS=$(OBFSPROXY_CFLAGS) libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="$(BUILT_DIR)/lib/libevent.a" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="$(BUILT_DIR)/lib/libssl.a $(BUILT_DIR)/lib/libz.a $(BUILT_DIR)/lib/libcrypto.a" ./configure --prefix=$(BUILT_DIR) cd $(OBFSPROXY_DIR) && make cd $(OBFSPROXY_DIR) && make install endif

1 0

[atlas/master] Don't assume that all relays have a country code.
by karsten＠torproject.org 04 Sep '12

04 Sep '12

commit 5fd15e08f6632bc54a42d5b895487d9d944f264d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 4 08:07:49 2012 -0400 Don't assume that all relays have a country code. Without this fix, we'd silently fail when parsing a relay without country code and pretend that we're still searching. There may be more beautiful fixes, e.g., displaying a special country flag for "unknown". --- js/models/relay.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/models/relay.js b/js/models/relay.js index ef884e3..326e378 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -141,8 +141,8 @@ define([ relay.or_address = relay.or_addresses ? relay.or_addresses[0].split(":")[0] : null; relay.or_port = relay.or_addresses ? relay.or_addresses[0].split(":")[1] : 0; relay.dir_port = relay.dir_address ? relay.dir_address.split(":")[1] : 0; - relay.country = relay.country.toLowerCase(); - relay.countryname = CountryCodes[relay.country]; + relay.country = relay.country ? relay.country.toLowerCase() : null; + relay.countryname = relay.country ? CountryCodes[relay.country] : null; relay.uptime = model.parsedate(relay.last_restarted); relay.uptime_hr = relay.uptime.hr; relay.as_no = relay.as_number;

1 0