nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert ticket 20982 changes.

Browse Source 
They broke stem, and breaking application compatibility is usually a
bad idea.

This reverts commit 6e10130e18,
commit 78a13df158, and
commit 62f52a888a.

We might re-apply this later, if all the downstream tools can handle
it, and it turns out to be useful for some reason.
This commit is contained in:
Nick Mathewson 2016-12-18 10:03:14 -05:00
parent 51ee549a90
commit ae89d9745d
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket20982
View File

@ -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.

4
src/or/config.c
View File

@ -4945,12 +4945,12 @@ options_init_from_torrc(int argc, char **argv)
} }
if (config_line_find(cmdline_only_options, "--version")) { if (config_line_find(cmdline_only_options, "--version")) {
printf("Tor %s\n", get_version()); printf("Tor version %s.\n",get_version());
exit(0); exit(0);
} }
if (config_line_find(cmdline_only_options, "--library-versions")) { 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("Library versions\tCompiled\t\tRuntime\n");
printf("Libevent\t\t%-15s\t\t%s\n", printf("Libevent\t\t%-15s\t\t%s\n",
tor_libevent_get_header_version_str(), tor_libevent_get_header_version_str(),

2
src/tools/tor-resolve.c
View File

@ -355,7 +355,7 @@ main(int argc, char **argv)
usage(); usage();
if (!strcmp(arg[0],"--version")) { if (!strcmp(arg[0],"--version")) {
printf("Tor %s\n",VERSION); printf("Tor version %s.\n",VERSION);
return 0; return 0;
} }
while (n_args && *arg[0] == '-') { while (n_args && *arg[0] == '-') {