Merge remote-tracking branch 'dgoulet/ticket31008_035_01'

changes/ticket31008

@@ -0,0 +1,3 @@
+  o Documentation (tor.1 man page):
+    - Fix typo -help to --help in tor.1 man page. Fixes bug 31008; bugfix on
+      0.2.2.9-alpha.

doc/tor.1.txt

@@ -37,7 +37,7 @@ Project's website.
 
 COMMAND-LINE OPTIONS
 --------------------
-[[opt-h]] **-h**, **-help**::
+[[opt-h]] **-h**, **--help**::
     Display a short help message and exit.
 
 [[opt-f]] **-f** __FILE__::