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

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

05 Jun '17

commit 7c54d2f3f0bcf483fd14dedb1a5dcbece6976411 Merge: 578a439 80aca15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 14:49:46 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0

1 0

[tor/maint-0.3.0] 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/maint-0.3.0] 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 80aca1501ae080ddb9c8f457290226dd5453b08a Merge: d75be18 d850d27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 14:49:46 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9

1 0

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

05 Jun '17

commit 9a6f93858267ba2d68f1f092498a06f5115126c4 Merge: 3f2d1f7 a56cfda Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 14:48:30 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux

1 0

[tor/maint-0.3.0] 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.3.0] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit d850d27369020706769e9e8a0d5fec621a5deb8a Merge: 33fcc0f 9a6f938 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 14:48:30 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 80aca1501ae080ddb9c8f457290226dd5453b08a Merge: d75be18 d850d27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 14:49:46 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9

1 0

[tor/maint-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.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