Merge remote-tracking branch 'rransom-tor/typo-fix-ohkah8Ah'

changes/typo-fix-ohkah8Ah

@@ -0,0 +1,9 @@
+  * Minor bugfixes:
+
+    - Clarify a log message specifying the characters permitted in
+      HiddenServiceAuthorizeClient client names.  Previously, the log
+      message said that "[A-Za-z0-9+-_]" were permitted; that could
+      have given the impression that every ASCII character between "+"
+      and "_" was permitted.  Now we say "[A-Za-z0-9+_-]".  Bugfix on
+      0.2.1.5-alpha.
+

src/or/rendservice.c

@@ -410,7 +410,7 @@ rend_config_services(const or_options_t *options, int validate_only)
         if (strspn(client_name, REND_LEGAL_CLIENTNAME_CHARACTERS) != len) {
           log_warn(LD_CONFIG, "HiddenServiceAuthorizeClient contains an "
                               "illegal client name: '%s'. Valid "
-                              "characters are [A-Za-z0-9+-_].",
+                              "characters are [A-Za-z0-9+_-].",
                    client_name);
           SMARTLIST_FOREACH(clients, char *, cp, tor_free(cp));
           smartlist_free(clients);