- tor-commits - lists.torproject.org

[tor/master] Add a changes file for the osx 10.6 compile fix
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit 4cbbb92e7fc7c9c4d374b35211c216a5419e3da2 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 8 22:56:28 2011 +0200 Add a changes file for the osx 10.6 compile fix We forgot to put it into 0.2.2.24-alpha. --- changes/osx_forgotten_compilefix | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/osx_forgotten_compilefix b/changes/osx_forgotten_compilefix new file mode 100644 index 0000000..754e09c --- /dev/null +++ b/changes/osx_forgotten_compilefix @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Added a forgotten cast that caused a compile warning on OS X 10.6. Bugfix + on 0.2.2.24-alpha. +

1 0

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

19 Apr '11

commit bc532bb13ff158f4c61ce04c7fd2bd0401ebe5a9 Merge: 4cbbb92 cfd7b11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:30:11 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

1 0

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

19 Apr '11

commit bba47a836c2fa0e55805c3871b5851b97a014bdb Merge: 750b511 bc532bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:30:36 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/osx_forgotten_compilefix | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)

1 0

[tor/master] Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only)
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit cfd7b118a700f8dba53915118b1be4ac267db23b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:29:20 2011 -0400 Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only) --- src/or/Makefile.am | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 51c1b0f..b56d496 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -55,19 +55,19 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i tor_main.o: micro-revision.i micro-revision.i: FORCE - @rm -f micro-revision.tmp; \ - if test -d ../../.git && test -x "`which git 2>&1;true`"; then \ - HASH="`git rev-parse --short=16 HEAD`"; \ - echo \"$$HASH\" > micro-revision.tmp; \ - fi; \ - if test ! -f micro-revision.tmp ; then \ - if test ! -f micro-revision.i ; then \ - echo '""' > micro-revision.i; \ - fi; \ - elif test ! -f micro-revision.i || \ - test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ - mv micro-revision.tmp micro-revision.i; \ - fi; true + @rm -f micro-revision.tmp; \ + if test -d ../../.git && test -x "`which git 2>&1;true`"; then \ + HASH="`git rev-parse --short=16 HEAD`"; \ + echo \"$$HASH\" > micro-revision.tmp; \ + fi; \ + if test ! -f micro-revision.tmp ; then \ + if test ! -f micro-revision.i ; then \ + echo '""' > micro-revision.i; \ + fi; \ + elif test ! -f micro-revision.i || \ + test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ + mv micro-revision.tmp micro-revision.i; \ + fi; true #Dummy target to ensure that micro-revision.i _always_ gets built. FORCE:

1 0

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

19 Apr '11

commit bc532bb13ff158f4c61ce04c7fd2bd0401ebe5a9 Merge: 4cbbb92 cfd7b11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:30:11 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

1 0

[tor/maint-0.2.2] Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only)
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit cfd7b118a700f8dba53915118b1be4ac267db23b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:29:20 2011 -0400 Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only) --- src/or/Makefile.am | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 51c1b0f..b56d496 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -55,19 +55,19 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i tor_main.o: micro-revision.i micro-revision.i: FORCE - @rm -f micro-revision.tmp; \ - if test -d ../../.git && test -x "`which git 2>&1;true`"; then \ - HASH="`git rev-parse --short=16 HEAD`"; \ - echo \"$$HASH\" > micro-revision.tmp; \ - fi; \ - if test ! -f micro-revision.tmp ; then \ - if test ! -f micro-revision.i ; then \ - echo '""' > micro-revision.i; \ - fi; \ - elif test ! -f micro-revision.i || \ - test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ - mv micro-revision.tmp micro-revision.i; \ - fi; true + @rm -f micro-revision.tmp; \ + if test -d ../../.git && test -x "`which git 2>&1;true`"; then \ + HASH="`git rev-parse --short=16 HEAD`"; \ + echo \"$$HASH\" > micro-revision.tmp; \ + fi; \ + if test ! -f micro-revision.tmp ; then \ + if test ! -f micro-revision.i ; then \ + echo '""' > micro-revision.i; \ + fi; \ + elif test ! -f micro-revision.i || \ + test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ + mv micro-revision.tmp micro-revision.i; \ + fi; true #Dummy target to ensure that micro-revision.i _always_ gets built. FORCE:

1 0

[tor/maint-0.2.1] Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only)
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit cfd7b118a700f8dba53915118b1be4ac267db23b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:29:20 2011 -0400 Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only) --- src/or/Makefile.am | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 51c1b0f..b56d496 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -55,19 +55,19 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i tor_main.o: micro-revision.i micro-revision.i: FORCE - @rm -f micro-revision.tmp; \ - if test -d ../../.git && test -x "`which git 2>&1;true`"; then \ - HASH="`git rev-parse --short=16 HEAD`"; \ - echo \"$$HASH\" > micro-revision.tmp; \ - fi; \ - if test ! -f micro-revision.tmp ; then \ - if test ! -f micro-revision.i ; then \ - echo '""' > micro-revision.i; \ - fi; \ - elif test ! -f micro-revision.i || \ - test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ - mv micro-revision.tmp micro-revision.i; \ - fi; true + @rm -f micro-revision.tmp; \ + if test -d ../../.git && test -x "`which git 2>&1;true`"; then \ + HASH="`git rev-parse --short=16 HEAD`"; \ + echo \"$$HASH\" > micro-revision.tmp; \ + fi; \ + if test ! -f micro-revision.tmp ; then \ + if test ! -f micro-revision.i ; then \ + echo '""' > micro-revision.i; \ + fi; \ + elif test ! -f micro-revision.i || \ + test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ + mv micro-revision.tmp micro-revision.i; \ + fi; true #Dummy target to ensure that micro-revision.i _always_ gets built. FORCE:

1 0

[tor/master] Reuse get_bytes_{read, written}() in status.c
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit c2d9d80a072ab586ba97159f1d401b9ed2980b2d Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Apr 16 14:48:46 2011 +0200 Reuse get_bytes_{read,written}() in status.c --- src/or/main.c | 9 --------- src/or/main.h | 1 - src/or/status.c | 6 ++---- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 9c19485..6da07ba 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1923,15 +1923,6 @@ get_uptime(void) return stats_n_seconds_working; } -/** Fills <b>n_read_in</b> with total bytes read and <b>n_written_out</b> - with total bytes written */ -void -get_traffic_stats(uint64_t *n_read_in, uint64_t *n_written_out) -{ - *n_read_in = stats_n_bytes_read; - *n_written_out = stats_n_bytes_written; -} - extern uint64_t rephist_total_alloc; extern uint32_t rephist_total_num; diff --git a/src/or/main.h b/src/or/main.h index ca3f641..67c3bb3 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -52,7 +52,6 @@ void ip_address_changed(int at_interface); void dns_servers_relaunch_checks(void); long get_uptime(void); -void get_traffic_stats(uint64_t *in, uint64_t *out); void control_signal_act(int the_signal); void handle_signals(int is_parent); diff --git a/src/or/status.c b/src/or/status.c index 054567f..3a51c8b 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -78,7 +78,6 @@ bytes_to_usage(uint64_t bytes) int log_heartbeat(time_t now) { - uint64_t in,out; char *bw_sent = NULL; char *bw_rcvd = NULL; char *uptime = NULL; @@ -99,10 +98,9 @@ log_heartbeat(time_t now) "in the cached consensus."); } - get_traffic_stats(&in, &out); uptime = secs_to_uptime(get_uptime()); - bw_sent = bytes_to_usage(out); - bw_rcvd = bytes_to_usage(in); + bw_rcvd = bytes_to_usage(get_bytes_read()); + bw_sent = bytes_to_usage(get_bytes_written()); log_fn(LOG_NOTICE, LD_HEARTBEAT, "Heartbeat: Tor's uptime is %s, with %d " "circuits open. I've pushed %s and received %s.",

1 0

[tor/master] Merge remote-tracking branch 'asn/heartbeat'
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit 750b5119c056587c599c8acafcbdeb43341d1d61 Merge: c4bf7f5 c2d9d80 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:08:28 2011 -0400 Merge remote-tracking branch 'asn/heartbeat' src/or/main.c | 9 --------- src/or/main.h | 1 - src/or/status.c | 6 ++---- 3 files changed, 2 insertions(+), 14 deletions(-)

1 0

r24661: {website} update the mirrors table with new mirrors. (website/trunk/include)
by Andrew Lewman 18 Apr '11

18 Apr '11

Author: phobos Date: 2011-04-18 22:15:05 +0000 (Mon, 18 Apr 2011) New Revision: 24661 Modified: website/trunk/include/mirrors-table.wmi Log: update the mirrors table with new mirrors. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-04-18 22:10:08 UTC (rev 24660) +++ website/trunk/include/mirrors-table.wmi 2011-04-18 22:15:05 UTC (rev 24661) @@ -173,23 +173,6 @@ <td>DE</td> - <td>torservers</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>DE</td> - <td>beme it</td> <td>Up to date</td> @@ -217,7 +200,7 @@ <td> - </td> <td> - </td> <td> - </td> - <td> - </td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> </tr> <tr> @@ -307,6 +290,23 @@ <tr> + <td>AT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td> - </td> + <td><a href="http://tor.webersiedlung.at/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IN</td> <td>India Tor Fans</td> @@ -409,6 +409,23 @@ <tr> + <td>DE</td> + + <td>torservers</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> <td>TheOnionRouter</td>

1 0