February 2014 - tor-commits - lists.torproject.org

[tor/release-0.2.4] changes file for bug 10904
by arma＠torproject.org 25 Feb '14

25 Feb '14

commit e4bc757cde98ed50723bab176eca77ad57cc483c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 14 23:51:14 2014 -0500 changes file for bug 10904 --- changes/bug10904 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug10904 b/changes/bug10904 new file mode 100644 index 0000000..6f551ea --- /dev/null +++ b/changes/bug10904 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation): + - Build without warnings under clang 3.4. (We have some macros that + define static functions only some of which will get used later in + the module. Starting with clang 3.4, these give a warning unless the + unused attribute is set on them.)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'karsten/geoip-feb2014' into maint-0.2.3
by arma＠torproject.org 25 Feb '14

25 Feb '14

commit 405d0554652c977ac5c758c1871b5fdf2924ff05 Merge: 9e90707 26dd328 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 15 00:06:01 2014 -0500 Merge remote-tracking branch 'karsten/geoip-feb2014' into maint-0.2.3 changes/geoip-february2014 | 3 + src/config/geoip |17809 ++++++++++++++++++++++++-------------------- 2 files changed, 9649 insertions(+), 8163 deletions(-)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'karsten/geoip6-feb2014' into maint-0.2.4
by arma＠torproject.org 25 Feb '14

25 Feb '14

commit bc58bfda70dca39a2a2d74c55600e0fe9d975ad9 Merge: 260b3b1 f6f691d Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 15 00:06:40 2014 -0500 Merge remote-tracking branch 'karsten/geoip6-feb2014' into maint-0.2.4 changes/geoip6-february2014 | 3 + src/config/geoip6 | 7834 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 6783 insertions(+), 1054 deletions(-)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 25 Feb '14

25 Feb '14

commit 260b3b1a190111a7ae078c4260c470bd31292b02 Merge: e4bc757 405d055 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 15 00:06:25 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-february2014 | 3 + src/config/geoip |17809 ++++++++++++++++++++++++-------------------- 2 files changed, 9649 insertions(+), 8163 deletions(-)

1 0

[tor/release-0.2.4] Enveigle configure to look for a2x.py as well as a2x.
by arma＠torproject.org 25 Feb '14

25 Feb '14

commit a496010642c29018b5141991683a7d93dcf7d117 Author: dana koch <dsk(a)google.com> Date: Sat Feb 15 21:46:55 2014 +1100 Enveigle configure to look for a2x.py as well as a2x. It's not guaranteed that every package symlinks a2x to a2x.py; OpenBSD does not do this, so let's just look for a2x.py as well. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6f40ac4..211d34c 100644 --- a/configure.ac +++ b/configure.ac @@ -167,7 +167,7 @@ AC_CHECK_PROG([SED],[sed],[sed],[/bin/false]) dnl check for asciidoc and a2x AC_PATH_PROG([ASCIIDOC], [asciidoc], none) -AC_PATH_PROG([A2X], [a2x], none) +AC_PATH_PROGS([A2X], [a2x, a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test x$asciidoc = xtrue)

1 0

[tor/release-0.2.4] add changes file for bug 10929
by arma＠torproject.org 25 Feb '14

25 Feb '14

commit 9f38cd935009e1c962804fb82bf0b0e3834e856d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 17 23:06:18 2014 +0000 add changes file for bug 10929 --- changes/bug10929 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/bug10929 b/changes/bug10929 new file mode 100644 index 0000000..acf3960 --- /dev/null +++ b/changes/bug10929 @@ -0,0 +1,6 @@ + - Minor bugfixes: + - Fix build warnings about missing "a2x" comment when building the + manpages from scratch on OpenBSD; OpenBSD calls it "a2x.py". + Fixes bug 10929; bugfix on tor-0.2.2.9-alpha. Patch from + Dana Koch. +

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/feature9777_024_squashed' into maint-0.2.4
by arma＠torproject.org 25 Feb '14

25 Feb '14

commit d21b24b3b6f4d8203c44cec7709a7f7a12a540df Merge: e616f5b 1068e50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 24 13:05:25 2014 -0500 Merge remote-tracking branch 'public/feature9777_024_squashed' into maint-0.2.4 changes/feature9777 | 3 ++ src/or/circuitbuild.c | 77 +++++++++++++++++++++++++++++++++++++++++++------ src/or/circuitlist.c | 10 ++++++- src/or/circuitlist.h | 1 + 4 files changed, 81 insertions(+), 10 deletions(-)

1 0

[tor/release-0.2.4] whoops; mistaek in a496010642c2. so many comma
by arma＠torproject.org 25 Feb '14

25 Feb '14

commit e616f5b51312fef55099f2a7cd93af58d2b08032 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 18 01:15:59 2014 +0000 whoops; mistaek in a496010642c2. so many comma --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 211d34c..42096db 100644 --- a/configure.ac +++ b/configure.ac @@ -167,7 +167,7 @@ AC_CHECK_PROG([SED],[sed],[sed],[/bin/false]) dnl check for asciidoc and a2x AC_PATH_PROG([ASCIIDOC], [asciidoc], none) -AC_PATH_PROGS([A2X], [a2x, a2x.py], none) +AC_PATH_PROGS([A2X], [a2x a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test x$asciidoc = xtrue)

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by arma＠torproject.org 25 Feb '14

25 Feb '14

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 25 Feb '14

25 Feb '14

commit d7950eda2bfd927a18df4a2620952d10dda1705c Merge: d21b24b 2658e70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 25 10:02:14 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-february2014-regcountry | 3 + src/config/geoip | 2399 ++++++++++++++------------------- 2 files changed, 1035 insertions(+), 1367 deletions(-)

1 0