From 515de3ac1947455d60d1eb873ecb6fa45729076b Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 16 Jul 2015 16:04:56 -0400 Subject: [PATCH] Make all changes files work with lintChanges --- changes/bug12498 | 4 ++-- changes/bug15881 | 5 +++-- changes/bug16115-NULL-getinfo-onions | 3 +-- changes/bug16115-init-var | 2 +- changes/bug16115-signing-key-NULL-check | 6 ------ changes/bug16115-spawn-comment | 6 ------ changes/bug16115-undef-directive-in-macro | 3 +-- changes/bug16115-unused-find-cipher | 7 ------- changes/bug16260 | 6 +++--- changes/bug16288 | 2 +- changes/bug16515-sandbox-cloexec | 2 +- changes/bug16543 | 2 +- changes/bug4862 | 4 ++-- changes/feature15817-clang-sanitizers | 2 +- changes/ticket15358 | 6 +++--- changes/ticket16034 | 1 + changes/ticket16140 | 1 + changes/ticket16189 | 12 ++++++------ 18 files changed, 28 insertions(+), 46 deletions(-) delete mode 100644 changes/bug16115-signing-key-NULL-check delete mode 100644 changes/bug16115-spawn-comment delete mode 100644 changes/bug16115-unused-find-cipher diff --git a/changes/bug12498 b/changes/bug12498 index 9f0147cc83..185ba467f4 100644 --- a/changes/bug12498 +++ b/changes/bug12498 @@ -1,9 +1,9 @@ - o Major features (Ed25519 identity keys: #12498, Prop220): + o Major features (Ed25519 identity keys, Prop220): - All relays now maintain a stronger identity key, using the Ed25519 elliptic curve signature format. This master key is designed so that it can be kept offline. Relays also generate an online signing key, and a set of other Ed25519 keys and certificates. - These are all automatically regenerated and rotated as needed. + These are all automatically regenerated and rotated as needed. - Directory authorities track which Ed25519 identity keys have been used with which RSA1024 identity keys, and do not allow them to vary freely. diff --git a/changes/bug15881 b/changes/bug15881 index 5cf561e07f..b0dcb2fc6d 100644 --- a/changes/bug15881 +++ b/changes/bug15881 @@ -1,3 +1,4 @@ - o Controller fixes: + o Minor bugfixes (controller): - Add the descriptor ID in each HS_DESC control event. It was missing - but specified in control-spec.txt. Fixes ticket 15881. + but specified in control-spec.txt. Fixes bug 15881; bugfix + on 0.2.5.2-alpha. diff --git a/changes/bug16115-NULL-getinfo-onions b/changes/bug16115-NULL-getinfo-onions index ec1661e18d..40983b34d1 100644 --- a/changes/bug16115-NULL-getinfo-onions +++ b/changes/bug16115-NULL-getinfo-onions @@ -1,4 +1,3 @@ o Minor fixes (threads, comments): - Check for NULL values in getinfo_helper_onions - Patch by "teor". - Fix on 915c7438a77e in Tor 0.2.7.1-alpha. + Patch by "teor". Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. diff --git a/changes/bug16115-init-var b/changes/bug16115-init-var index e3e924a3e3..e29bb133de 100644 --- a/changes/bug16115-init-var +++ b/changes/bug16115-init-var @@ -1,4 +1,4 @@ o Minor fixes (threads, comments): - Always initialise return value in compute_desc_id in rendcommon.c Patch by "teor". - Fix on e6a581f126ba, released in 0.2.7.1-alpha. + Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. diff --git a/changes/bug16115-signing-key-NULL-check b/changes/bug16115-signing-key-NULL-check deleted file mode 100644 index 3d4f05bc28..0000000000 --- a/changes/bug16115-signing-key-NULL-check +++ /dev/null @@ -1,6 +0,0 @@ - o Minor fixes (threads, comments): - - Ensure signing_key is non-NULL before accessing one of its members - signing_key can be NULL in ed_key_init_from_file in routerkeys.c. - Discovered by clang 3.7 address sanitizer. - Patch by "teor". - Fix on c03694938ed0, not in any released version of Tor. diff --git a/changes/bug16115-spawn-comment b/changes/bug16115-spawn-comment deleted file mode 100644 index 7792564688..0000000000 --- a/changes/bug16115-spawn-comment +++ /dev/null @@ -1,6 +0,0 @@ - o Minor fixes (threads, comments): - - Fix an incorrect comment on spawn_func in compat_pthreads.c. - spawn_func calls pthread_create on unix, not fork - Patch by "teor". - Bugfix on unknown tor version (existing code split out of - compat.c into compat_pthreads.c in c2f0d52b7fb9 on 22 Sep 2013). diff --git a/changes/bug16115-undef-directive-in-macro b/changes/bug16115-undef-directive-in-macro index 8031267cdf..17aac1f88c 100644 --- a/changes/bug16115-undef-directive-in-macro +++ b/changes/bug16115-undef-directive-in-macro @@ -2,5 +2,4 @@ - Remove undefined directive-in-macro in test_util_writepid clang 3.7 complains that using a preprocessor directive inside a macro invocation in test_util_writepid in test_util.c is undefined. - Patch by "teor". - Fix on 79e85313aa61 on 0.2.7.1-alpha. + Patch by "teor". Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. diff --git a/changes/bug16115-unused-find-cipher b/changes/bug16115-unused-find-cipher deleted file mode 100644 index 0f04d6795b..0000000000 --- a/changes/bug16115-unused-find-cipher +++ /dev/null @@ -1,7 +0,0 @@ - o Minor fixes (threads, comments): - - Silence unused variable warnings in find_cipher_by_id - Unused variable warnings were still generated under some versions - of OpenSSL. Instead, make sure all variables are used under all - versions of OpenSSL. - Patch by "teor". - Fix on 496df21c89d1, not in any released version of tor. diff --git a/changes/bug16260 b/changes/bug16260 index a75cb1df0d..a2797b8b0c 100644 --- a/changes/bug16260 +++ b/changes/bug16260 @@ -4,8 +4,8 @@ current circuit exit node which resulted in changing the original intro point choice. This resulted in the hidden service skipping excluded nodes like for instance reconnecting to an expired intro - point.; Fixes #16260; bugfixes on tor-0.1.0.1-rc~460. + point. Fixes bug 16260; bugfix on 0.1.0.1-rc. This is particularly important for the introduction point retry - behavior (#8239) since cannibalization is allowed, which is desired, - so it's important to pin the chosen exit point. + behavior (see bug 8239) since cannibalization is allowed, which is + desired, so it's important to pin the chosen exit point. diff --git a/changes/bug16288 b/changes/bug16288 index 7ddf615d5a..b3cfaa09e7 100644 --- a/changes/bug16288 +++ b/changes/bug16288 @@ -3,4 +3,4 @@ tor_accept_socket_nonblocking() which made tor go beyond the open file limit set previously. With this fix, before opening a new socket, tor validates the open file limit just before and if the max has been - reached, return EMFILE.; Fixes #16288; bugfix on tor-0.1.1.1-alpha~74. + reached, return EMFILE. Fixes bug 16288; bugfix on 0.1.1.1-alpha. diff --git a/changes/bug16515-sandbox-cloexec b/changes/bug16515-sandbox-cloexec index 2130f85911..c667f4b23c 100644 --- a/changes/bug16515-sandbox-cloexec +++ b/changes/bug16515-sandbox-cloexec @@ -1,3 +1,3 @@ o Minor fixes (sandbox, files): - Use the sandbox in tor_open_cloexec whether or not O_CLOEXEC is defined. - Patch by "teor". Fix on 0.2.3.1-alpha. + Patch by "teor". Fixes bug 16515; bugfix on 0.2.3.1-alpha. diff --git a/changes/bug16543 b/changes/bug16543 index 6f77eaa8ad..b2528336da 100644 --- a/changes/bug16543 +++ b/changes/bug16543 @@ -1,4 +1,4 @@ - - Removed features: + o Removed features: - Remove the HidServDirectoryV2 option. Now all relays offer to store hidden service descriptors. Related to 16543. - Remove the VoteOnHidServDirectoriesV2 option, since all authorities diff --git a/changes/bug4862 b/changes/bug4862 index e636395be3..f92d79d7ec 100644 --- a/changes/bug4862 +++ b/changes/bug4862 @@ -2,7 +2,7 @@ - Remove the introduction point adaptative algorithm which is leaking popularity by changing the amount of introduction points depending on the amount of traffic the HS sees. With this, we stick to only 3 - introduction points. + introduction points. Closes ticket 4862. - Add the torrc option HiddenServiceNumIntroductionPoints for an operatory to specify a fix amount of introduction points. Maximum - value is 10 and default is 3. + value is 10 and default is 3. Closes ticket 4862. diff --git a/changes/feature15817-clang-sanitizers b/changes/feature15817-clang-sanitizers index 8bdf061c3a..0010bd6679 100644 --- a/changes/feature15817-clang-sanitizers +++ b/changes/feature15817-clang-sanitizers @@ -4,4 +4,4 @@ Add clang dynamic sanitizer blacklist in contrib/clang/sanitizer_blacklist.txt to exempt known undefined behavior. Include detailed usage instructions in the blacklist. - Patch by "teor". + Patch by "teor". Closes ticket 15817. diff --git a/changes/ticket15358 b/changes/ticket15358 index 8c85d51007..5b1758641e 100644 --- a/changes/ticket15358 +++ b/changes/ticket15358 @@ -1,3 +1,3 @@ - o Features (control protocl): - - Support network-liveness GETINFO key and NETWORK_LIVENESS events in the - control protocol. Resolves ticket #15358. + o Features (control protocl): + - Support network-liveness GETINFO key and NETWORK_LIVENESS events in the + control protocol. Resolves ticket 15358. diff --git a/changes/ticket16034 b/changes/ticket16034 index b909946cd4..a8546efbe8 100644 --- a/changes/ticket16034 +++ b/changes/ticket16034 @@ -4,3 +4,4 @@ are on an operating system that has not upgraded to OpenSSL 1.0 or later, and you compile Tor from source, you will need to install a more recent OpenSSL to link Tor against.) + Resolves ticket 16034. diff --git a/changes/ticket16140 b/changes/ticket16140 index 00c19f1778..27986715c5 100644 --- a/changes/ticket16140 +++ b/changes/ticket16140 @@ -4,3 +4,4 @@ Elliptic Curve Cryptography. In particular support for at least one of P256 or P224 is now required, with manual configuration needed if only P224 is available. + Resolves ticket 16140. diff --git a/changes/ticket16189 b/changes/ticket16189 index aec8e13cee..f07fad90ee 100644 --- a/changes/ticket16189 +++ b/changes/ticket16189 @@ -1,6 +1,6 @@ - o Features (crypto, testing): - - Now that OpenSSL has its own scrypt implementation, add an unit - test that checks for interoperability between libscrypt_scrypt() - and OpenSSL's EVP_PBE_scrypt() so that we could not use libscrypt - and rely on EVP_PBE_scrypt() whenever possible. Resolves ticket - 16189. + o Minor Features (crypto, testing): + - Now that OpenSSL has its own scrypt implementation, add an unit + test that checks for interoperability between libscrypt_scrypt() + and OpenSSL's EVP_PBE_scrypt() so that we could not use libscrypt + and rely on EVP_PBE_scrypt() whenever possible. Resolves ticket + 16189.