From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 19 Sep 2017 12:48:39 +0000 (-0400)
Subject: plural in manpage
X-Git-Tag: tor-0.3.2.2-alpha~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f602e86433cc132981e8f9727266353ea2c3b0e;p=thirdparty%2Ftor.git

plural in manpage
---

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index ef70d36b3d..f669a055c0 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 bc602e61a5..793adf87e2 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 \