[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.1
commit 12258bbb9056ae400a58de4eb57c3de079b21782 Merge: 2968c716d b205714ba Author: David Goulet Date: Tue Jul 3 13:31:06 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26535.029 | 5 + src/test/ntor_ref.py | 9 ++--- 2 files changed, 11 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.1
commit 2968c716d7689eafcf32a1f5327af7b1ad1582ce
Merge: a3ec89a4f 1953a7e61
Author: Nick Mathewson
Date: Fri Jun 29 23:11:47 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.1
scripts/maint/checkSpace.pl | 5 -
1 file changed, 5 deletions(-)
diff --cc scripts/maint/checkSpace.pl
index 6d19d6ccd,5af95a27e..3043eb1aa
--- a/scripts/maint/checkSpace.pl
+++ b/scripts/maint/checkSpace.pl
@@@ -168,32 -157,25 +168,27 @@@ for my $fn (@ARGV)
}
}
- ## Check for forbidden functions except when they are
- # explicitly permitted
- if (/\bassert\(/ && not /assert OK/) {
- print "assert :$fn:$. (use tor_assert)\n";
- }
- if (/\bmemcmp\(/ && not /memcmp OK/) {
- print "memcmp :$fn:$. (use {tor,fast}_mem{eq,neq,cmp}\n";
- }
- # always forbidden.
- if (not / OVERRIDE /) {
- if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) {
- print "$& :$fn:$.\n";
- }
- if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or
- /\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) {
- print "$& :$fn:$.(use tor_malloc, tor_free, etc)\n";
- }
- }
+## Check for forbidden functions except when they are
+# explicitly permitted
+if (/\bassert\(/ && not /assert OK/) {
+msg "assert :$fn:$. (use tor_assert)\n";
+}
+if (/\bmemcmp\(/ && not /memcmp OK/) {
+msg "memcmp :$fn:$. (use {tor,fast}_mem{eq,neq,cmp}\n";
+}
+# always forbidden.
+if (not /\ OVERRIDE\ /) {
+if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) {
+msg "$& :$fn:$.\n";
+}
+if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or
+/\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) {
+msg "$& :$fn:$.(use tor_malloc, tor_free, etc)\n";
+}
+}
}
}
- ## Warn if the file doesn't end with a blank line.
- #(End each file with a single blank line.)
- if (! $lastnil) {
- msg " EOL\@EOF:$fn:$.\n";
- }
close(F);
}
+
+exit $found;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.1
commit a3ec89a4f8a6222403697b7f7fce5d5138b79994 Merge: d583459d5 3c0a63c40 Author: Nick Mathewson Date: Fri Jun 29 13:49:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/test/test_shared_random.c | 1 + 1 file changed, 1 insertion(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.1
commit ea14d3408df7c846722b54484cf5b8d61de5384f Merge: b89a66e99 890bc15ab Author: Nick Mathewson Date: Fri Jun 29 13:06:15 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26467 | 3 +++ 1 file changed, 3 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.1
commit 1385a5118d55edd3dd672eeb793b662853f30758 Merge: d6d3f8486 b426e83f0 Author: Nick Mathewson Date: Fri Jun 29 13:00:56 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/or/routerlist.c | 2 ++ src/or/shared_random_state.c | 1 + src/test/test_hs.c| 7 +-- src/test/test_shared_random.c | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.1
commit d6d3f8486dbac9837a793f431dcd58505e7274e4 Merge: 340fcc7e2 fcd26af7c Author: Nick Mathewson Date: Tue Jun 26 09:21:59 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/feature26372_029 | 4 configure.ac | 6 +- 2 files changed, 9 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.1
commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 Merge: 9713ecfc4 dd69e74e3 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .editorconfig | 33 + 1 file changed, 33 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
