diff options
author | Mark H Weaver <mhw@netris.org> | 2014-09-13 19:48:47 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2014-09-13 19:48:47 -0400 |
commit | 9fac9e3be3925713c20f1d5ff8b35353af10baa2 (patch) | |
tree | 9add6e882007184cc420b2e26d620de0982d934a /gnu/packages/tor.scm | |
parent | 9d77da2a47ddb707edcbd1ca17f5c0ac3c068b04 (diff) | |
parent | d7ab698a620873c11103fa2bd082884f0198723a (diff) | |
download | guix-9fac9e3be3925713c20f1d5ff8b35353af10baa2.tar.gz |
Merge branch 'master' into core-updates
Conflicts: gnu-system.am
Diffstat (limited to 'gnu/packages/tor.scm')
-rw-r--r-- | gnu/packages/tor.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index a756ebdba3..bcf8edfb25 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; ;;; This file is part of GNU Guix. @@ -49,7 +49,7 @@ ;; TODO: Recommend `torsocks' since `torify' needs it. (home-page "http://www.torproject.org/") - (synopsis "An anonymous network router to improve privacy on the Internet") + (synopsis "Anonymous network router to improve privacy on the Internet") (description "Tor protects you by bouncing your communications around a distributed network of relays run by volunteers all around the world: it prevents |