Merge commit 'sebastian/fixes'

Makefile.am

@@ -61,7 +61,8 @@ doxygen:
 test: all
 	./src/test/test
 
-# Avoid strlcpy.c, strlcat.c, tree.h
+# Avoid strlcpy.c, strlcat.c, aes.c, OpenBSD_malloc_Linux.c, sha256.c,
+# eventdns.[hc], tinytest.[ch]
 check-spaces:
 	./contrib/checkSpace.pl -C                    \
 	        src/common/*.h                        \

src/common/util.c

@@ -2450,7 +2450,7 @@ tor_vsscanf(const char *buf, const char *pattern, va_list ap)
  * long widths. %u does not consume any space.  Is locale-independent.
  * Returns -1 on malformed patterns.
  *
- * (As with other local-independent functions, we need this to parse data that
+ * (As with other locale-independent functions, we need this to parse data that
  * is in ASCII without worrying that the C library's locale-handling will make
  * miscellaneous characters look like numbers, spaces, and so on.)
  */