diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-08-01 23:42:28 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-08-01 23:42:28 +0200 |
commit | aa9780daf92131dc9ee19868f9621fd2be56ab78 (patch) | |
tree | 39733db2ecad867c291d87d5d1cbf4e6de2eb845 /gnu/packages/tor.scm | |
parent | 6484e82d4ce79b7b5ce72ecf77fb8d450eb0c401 (diff) | |
parent | fc8f0631b4163d31a97fccb9a14201b5e861fa52 (diff) | |
download | patches-aa9780daf92131dc9ee19868f9621fd2be56ab78.tar patches-aa9780daf92131dc9ee19868f9621fd2be56ab78.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/tor.scm')
-rw-r--r-- | gnu/packages/tor.scm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 314901fa4e..1d5a1f1612 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net> +;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> @@ -54,8 +54,7 @@ "0hhyb1wil8japynqnm07r1f67w3wdnafdg9amzlrrcfcyq5qim28")))) (build-system gnu-build-system) (arguments - `(#:configure-flags (list "--enable-expensive-hardening" - "--enable-gcc-hardening" + `(#:configure-flags (list "--enable-gcc-hardening" "--enable-linker-hardening"))) (native-inputs `(("python" ,python-2))) ; for tests |