[tor-commits] [tor/master] Revert ticket 20982 changes.

[nickm at torproject.org]

commit ae89d9745d3a0d0b2fdf333bd3299d1654bf7b39
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Dec 18 10:03:14 2016 -0500

    Revert ticket 20982 changes.
    
    They broke stem, and breaking application compatibility is usually a
    bad idea.
    
    This reverts commit 6e10130e18c80f4521e31b071455ae0b1bbea761,
    commit 78a13df15842e8ab262e17825160386fadb77056, and
    commit 62f52a888acc191bcb507d27d31d54e42e6effdd.
    
    We might re-apply this later, if all the downstream tools can handle
    it, and it turns out to be useful for some reason.
---
 changes/ticket20982     | 5 -----
 src/or/config.c         | 4 ++--
 src/tools/tor-resolve.c | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/changes/ticket20982 b/changes/ticket20982
deleted file mode 100644
index 5eaab4d..0000000
--- a/changes/ticket20982
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (client):
-    - Conform to the GNU Coding Standards section 4.7.1 which states
-      that the output of the version option consists of the program name
-      and its version number without prefixes. Fixes bug 20982; bugfix
-      on 0.0.2pre24.
diff --git a/src/or/config.c b/src/or/config.c
index 60c00d4..7f789c4 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4945,12 +4945,12 @@ options_init_from_torrc(int argc, char **argv)
   }
 
   if (config_line_find(cmdline_only_options, "--version")) {
-    printf("Tor %s\n", get_version());
+    printf("Tor version %s.\n",get_version());
     exit(0);
   }
 
   if (config_line_find(cmdline_only_options, "--library-versions")) {
-    printf("Tor %s\n", get_version());
+    printf("Tor version %s. \n", get_version());
     printf("Library versions\tCompiled\t\tRuntime\n");
     printf("Libevent\t\t%-15s\t\t%s\n",
                       tor_libevent_get_header_version_str(),
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index fc41a83..29f85c4 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -355,7 +355,7 @@ main(int argc, char **argv)
     usage();
 
   if (!strcmp(arg[0],"--version")) {
-    printf("Tor %s\n",VERSION);
+    printf("Tor version %s.\n",VERSION);
     return 0;
   }
   while (n_args && *arg[0] == '-') {