[tor-commits] [tor/master] plural in manpage

[nickm at torproject.org]

commit 1f602e86433cc132981e8f9727266353ea2c3b0e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 19 08:48:39 2017 -0400

    plural in manpage
---
 doc/tor.1.txt              |  2 +-
 scripts/test/scan-build.sh | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index ef70d36b3..f669a055c 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2382,7 +2382,7 @@ The following options are used to configure a hidden service.
 
 [[HiddenServiceVersion]] **HiddenServiceVersion** __version__,__version__,__...__::
     A list of rendezvous service descriptor versions to publish for the hidden
-    service. Currently, version 2 and 3 are supported. (Default: 2)
+    service. Currently, versions 2 and 3 are supported. (Default: 2)
 
 [[HiddenServiceAuthorizeClient]] **HiddenServiceAuthorizeClient** __auth-type__ __client-name__,__client-name__,__...__::
     If configured, the hidden service is accessible for authorized clients
diff --git a/scripts/test/scan-build.sh b/scripts/test/scan-build.sh
index bc602e61a..793adf87e 100755
--- a/scripts/test/scan-build.sh
+++ b/scripts/test/scan-build.sh
@@ -56,7 +56,15 @@ scan-build \
     $CHECKERS \
     ./configure
 
-make clean
+scan-build \
+    make clean
+
+# Make this not get scanned for dead assignments, since it has lots of
+# dead assignments we don't care about.
+scan-build \
+    $CHECKERS \
+    -disable-checker deadcode.DeadStores \
+    make -j5 -k ./src/ext/ed25519/ref10/libed25519_ref10.a
 
 scan-build \
     $CHECKERS $OUTPUTARG \