diff options
| -rw-r--r-- | changes/bug16913 | 4 | ||||
| -rw-r--r-- | changes/bug16929 | 5 | ||||
| -rw-r--r-- | doc/include.am | 2 | ||||
| -rw-r--r-- | src/tools/tor-resolve.c | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/changes/bug16913 b/changes/bug16913 new file mode 100644 index 0000000000..464140b538 --- /dev/null +++ b/changes/bug16913 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix an usage message of tor-resolve(1) so that it no longer lists + the removed -F option. Resolves ticket #16913; bugfix on Tor + 0.2.2.28-beta. diff --git a/changes/bug16929 b/changes/bug16929 new file mode 100644 index 0000000000..83e60d7eb2 --- /dev/null +++ b/changes/bug16929 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - include the TUNING document in our source tarball. It is referred + to in the ChangeLog and an error message. Fixes bug 16929; bugfix + on 0.2.6.1-alpha. + diff --git a/doc/include.am b/doc/include.am index 47f1ab3433..ff2de845b2 100644 --- a/doc/include.am +++ b/doc/include.am @@ -37,7 +37,7 @@ endif EXTRA_DIST+= doc/HACKING doc/asciidoc-helper.sh \ $(html_in) $(man_in) $(txt_in) \ doc/state-contents.txt \ - doc/torrc_format.txt + doc/torrc_format.txt doc/TUNING docdir = @docdir@ diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 08bce15e69..29f85c4d17 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -327,7 +327,7 @@ do_resolve(const char *hostname, uint32_t sockshost, uint16_t socksport, static void usage(void) { - puts("Syntax: tor-resolve [-4] [-5] [-v] [-x] [-F] [-p port] " + puts("Syntax: tor-resolve [-4] [-5] [-v] [-x] [-p port] " "hostname [sockshost[:socksport]]"); exit(1); } |