- tor-commits - lists.torproject.org

[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 0e554f93d677fefc649d103ed08ba298c27b3fed Merge: bc532bb dfc9c6a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:31:42 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug2750 | 6 ++++++ src/or/routerparse.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.1] Correct the warning emitted when rejecting an oversized HS desc
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit bfebc942eaf7098e8d35f1de9159da450d5e3969 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Apr 11 02:26:07 2011 -0700 Correct the warning emitted when rejecting an oversized HS desc --- changes/bug2750 | 6 ++++++ src/or/routerparse.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug2750 b/changes/bug2750 new file mode 100644 index 0000000..4371a0a --- /dev/null +++ b/changes/bug2750 @@ -0,0 +1,6 @@ + o Minor bugfixes + - Correct the warning displayed when a rendezvous descriptor exceeds + the maximum size. Fixes bug 2750; bugfix on 0.2.1.5-alpha. Found + by John Brooks. + + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 1faa177..28ecaf0 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3629,7 +3629,7 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, /* Check length. */ if (strlen(desc) > REND_DESC_MAX_SIZE) { log_warn(LD_REND, "Descriptor length is %i which exceeds " - "maximum rendezvous descriptor size of %i kilobytes.", + "maximum rendezvous descriptor size of %i bytes.", (int)strlen(desc), REND_DESC_MAX_SIZE); goto err; }

1 0

[tor/maint-0.2.1] Add an XXX
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit adc31001c2f9923f8fcee2141d233200c95373cf Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Apr 18 13:25:48 2011 -0700 Add an XXX --- src/or/routerparse.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 28ecaf0..3d73f8d 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3628,6 +3628,8 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, eos = eos + 1; /* Check length. */ if (strlen(desc) > REND_DESC_MAX_SIZE) { + /* XXX023 If we are parsing this descriptor as a server, this + * should be a protocol warning. */ log_warn(LD_REND, "Descriptor length is %i which exceeds " "maximum rendezvous descriptor size of %i bytes.", (int)strlen(desc), REND_DESC_MAX_SIZE);

1 0

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

19 Apr '11

commit dfc9c6a0f9c0488e437dfbf1181041ca0e194f1d Merge: cfd7b11 adc3100 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:30:50 2011 -0400 Merge remote-tracking branch 'rransom/bug2750-v3' into maint-0.2.1 changes/bug2750 | 6 ++++++ src/or/routerparse.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletions(-)

1 0

[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