June 2017 - tor-commits - lists.torproject.org

[tor/maint-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 2e5220cb8b34b614fa10102899841247e906fb7b Merge: 1a540b5 4ee48cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 14:38:54 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 src/or/geoip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 020c003a636a876a1b86295592e8782ab93df5a3 Merge: b104ea7 2e5220c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 14:39:00 2017 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 src/or/geoip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.2.6] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit a56cfdaba20683562e5793d6bded58a591afb04c Merge: 9ea3d08 2e5220c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 14:39:06 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 Ours merge to avoid taking 4ee48cb434c46d9e4c477dabd8a97f03e3db221d

1 0

[tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 2e5220cb8b34b614fa10102899841247e906fb7b Merge: 1a540b5 4ee48cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 14:38:54 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 src/or/geoip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.2.4] Fix C89 warning (since Tor 0.2.4-5 still care about that.)
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 4ee48cb434c46d9e4c477dabd8a97f03e3db221d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 14:38:38 2017 -0400 Fix C89 warning (since Tor 0.2.4-5 still care about that.) --- src/or/geoip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index 4abd519..2db64c9 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -126,6 +126,7 @@ geoip_parse_entry(const char *line, sa_family_t family) tor_addr_t low_addr, high_addr; char c[3]; char *country = NULL; + char buf[512]; if (!geoip_countries) init_geoip_countries(); @@ -145,7 +146,6 @@ geoip_parse_entry(const char *line, sa_family_t family) if (*line == '#') return 0; - char buf[512]; if (family == AF_INET) { unsigned int low, high; if (tor_sscanf(line,"%u,%u,%2s", &low, &high, c) == 3 ||

1 0

[tor/maint-0.2.6] Fix C89 warning (since Tor 0.2.4-5 still care about that.)
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 4ee48cb434c46d9e4c477dabd8a97f03e3db221d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 14:38:38 2017 -0400 Fix C89 warning (since Tor 0.2.4-5 still care about that.) --- src/or/geoip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index 4abd519..2db64c9 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -126,6 +126,7 @@ geoip_parse_entry(const char *line, sa_family_t family) tor_addr_t low_addr, high_addr; char c[3]; char *country = NULL; + char buf[512]; if (!geoip_countries) init_geoip_countries(); @@ -145,7 +146,6 @@ geoip_parse_entry(const char *line, sa_family_t family) if (*line == '#') return 0; - char buf[512]; if (family == AF_INET) { unsigned int low, high; if (tor_sscanf(line,"%u,%u,%2s", &low, &high, c) == 3 ||

1 0

[tor/release-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 2e5220cb8b34b614fa10102899841247e906fb7b Merge: 1a540b5 4ee48cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 14:38:54 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 src/or/geoip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 98f610068f669cabbd2fde764c79e8c9d0481976 Merge: df23e28 4ee48cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 14:38:48 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 src/or/geoip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.2.5] Fix C89 warning (since Tor 0.2.4-5 still care about that.)
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 4ee48cb434c46d9e4c477dabd8a97f03e3db221d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 14:38:38 2017 -0400 Fix C89 warning (since Tor 0.2.4-5 still care about that.) --- src/or/geoip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index 4abd519..2db64c9 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -126,6 +126,7 @@ geoip_parse_entry(const char *line, sa_family_t family) tor_addr_t low_addr, high_addr; char c[3]; char *country = NULL; + char buf[512]; if (!geoip_countries) init_geoip_countries(); @@ -145,7 +146,6 @@ geoip_parse_entry(const char *line, sa_family_t family) if (*line == '#') return 0; - char buf[512]; if (family == AF_INET) { unsigned int low, high; if (tor_sscanf(line,"%u,%u,%2s", &low, &high, c) == 3 ||

1 0

[tor-browser-build/master] Fix gcc lib path on linux32
by boklm＠torproject.org 05 Jun '17

05 Jun '17

commit 8e1099b5c657b30ae9cd5f57842b18533aa62e69 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 5 19:41:50 2017 +0200 Fix gcc lib path on linux32 --- projects/gcc/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/gcc/config b/projects/gcc/config index d97afbf..6bf14ad 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -13,7 +13,7 @@ var: tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export PATH="/var/tmp/dist/gcc/bin:$PATH" [% IF c("var/osname") == "linux-i686" -%] - export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib32 + export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib [% ELSE -%] export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib64 [% END -%]

1 0