August 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 1b5c9a580879fe2836e70605f435949cfc6c23ba Merge: b63d157b4 90f6c590a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 20:07:47 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 .appveyor.yml | 3 --- changes/ticket27275 | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit 36bb11a65081bb0c2a2a86359c6386bde67f8046 Merge: c1ad40627 cc4ea34a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --cc src/test/test.c index 383bc0000,6330eb9b9..a935ac36a --- a/src/test/test.c +++ b/src/test/test.c @@@ -20,8 -20,10 +20,10 @@@ #include <direct.h> #else #include <dirent.h> -#endif +#endif /* defined(_WIN32) */ + #include <math.h> + /* These macros pull in declarations for some functions and structures that * are typically file-private. */ #define GEOIP_PRIVATE

1 0

[tor/release-0.3.3] Silence a compilation warning on MSVC 2017 and clang-cl
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit cc4ea34a262993bf69836d1bffa3175e24261565 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 18:55:39 2018 +1000 Silence a compilation warning on MSVC 2017 and clang-cl test.c no longer uses lround(), so we don't need to declare it, and we can use math.h for fabs(). Fixes bug 27185; bugfix on 0.2.2.2-alpha. --- changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/changes/bug27185 b/changes/bug27185 new file mode 100644 index 000000000..79221b3df --- /dev/null +++ b/changes/bug27185 @@ -0,0 +1,3 @@ + o Minor bugfixes (Windows, compilation): + - Silence a compilation warning on MSVC 2017 and clang-cl. + Fixes bug 27185; bugfix on 0.2.2.2-alpha. diff --git a/src/test/test.c b/src/test/test.c index 0fef69790..6330eb9b9 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -22,6 +22,8 @@ #include <dirent.h> #endif +#include <math.h> + /* These macros pull in declarations for some functions and structures that * are typically file-private. */ #define GEOIP_PRIVATE @@ -31,14 +33,6 @@ #define MAIN_PRIVATE #define STATEFILE_PRIVATE -/* - * Linux doesn't provide lround in math.h by default, but mac os does... - * It's best just to leave math.h out of the picture entirely. - */ -//#include <math.h> -long int lround(double x); -double fabs(double x); - #include "or.h" #include "backtrace.h" #include "buffers.h"

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit d0dadf4d17540edd33da9617366cd6f3c7568c69 Merge: cbd71f5c9 e01ea64f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-)

1 0

[tor/release-0.3.4] Silence a compilation warning on MSVC 2017 and clang-cl
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit cc4ea34a262993bf69836d1bffa3175e24261565 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 18:55:39 2018 +1000 Silence a compilation warning on MSVC 2017 and clang-cl test.c no longer uses lround(), so we don't need to declare it, and we can use math.h for fabs(). Fixes bug 27185; bugfix on 0.2.2.2-alpha. --- changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/changes/bug27185 b/changes/bug27185 new file mode 100644 index 000000000..79221b3df --- /dev/null +++ b/changes/bug27185 @@ -0,0 +1,3 @@ + o Minor bugfixes (Windows, compilation): + - Silence a compilation warning on MSVC 2017 and clang-cl. + Fixes bug 27185; bugfix on 0.2.2.2-alpha. diff --git a/src/test/test.c b/src/test/test.c index 0fef69790..6330eb9b9 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -22,6 +22,8 @@ #include <dirent.h> #endif +#include <math.h> + /* These macros pull in declarations for some functions and structures that * are typically file-private. */ #define GEOIP_PRIVATE @@ -31,14 +33,6 @@ #define MAIN_PRIVATE #define STATEFILE_PRIVATE -/* - * Linux doesn't provide lround in math.h by default, but mac os does... - * It's best just to leave math.h out of the picture entirely. - */ -//#include <math.h> -long int lround(double x); -double fabs(double x); - #include "or.h" #include "backtrace.h" #include "buffers.h"

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit e01ea64f0a072b321bb8b33e32cfa5644b4364d4 Merge: 8691046ac 36bb11a65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit e01ea64f0a072b321bb8b33e32cfa5644b4364d4 Merge: 8691046ac 36bb11a65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit 6e0872e8672ed18f8c250cdcbdfd3d7bf047c076 Merge: ced350882 e01ea64f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --cc src/test/test.c index f0e8b9b72,2e7d39932..aea3ad659 --- a/src/test/test.c +++ b/src/test/test.c @@@ -23,8 -22,11 +23,10 @@@ #include <dirent.h> #endif /* defined(_WIN32) */ + #include <math.h> + /* These macros pull in declarations for some functions and structures that * are typically file-private. */ -#define GEOIP_PRIVATE #define ROUTER_PRIVATE #define CIRCUITSTATS_PRIVATE #define CIRCUITLIST_PRIVATE

1 0

[tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit 36bb11a65081bb0c2a2a86359c6386bde67f8046 Merge: c1ad40627 cc4ea34a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --cc src/test/test.c index 383bc0000,6330eb9b9..a935ac36a --- a/src/test/test.c +++ b/src/test/test.c @@@ -20,8 -20,10 +20,10 @@@ #include <direct.h> #else #include <dirent.h> -#endif +#endif /* defined(_WIN32) */ + #include <math.h> + /* These macros pull in declarations for some functions and structures that * are typically file-private. */ #define GEOIP_PRIVATE

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit b63d157b498669b3935b072f88f0fad64bcb8b1e Merge: d1a9f6de9 6e0872e86 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-)

1 0