nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-22 22:14:58 +02:00
Code Issues Packages Projects Releases Wiki Activity
35,254 Commits 53 Branches 629 Tags 108 MiB
6db2e59f20
Commit Graph

35254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson
80c5c874cc Merge branch 'maint-0.4.3' 2020-02-11 08:53:41 -05:00
Nick Mathewson
00fe214729 Merge branch 'maint-0.4.1' into maint-0.4.2 
"ours" merge, since the exceptions.txt file is already fixed in this branch.
 2020-02-11 08:53:00 -05:00
Nick Mathewson
0ff3e8f4a0 Remove a redundant practracker exception line in maint-0.4.1 
This will our "git push" hook not complain about pushing from
maint-0.4.1.
 2020-02-11 08:52:26 -05:00
Nick Mathewson
384a771fcc Merge branch 'ticket32362_squashed' 2020-02-11 08:47:19 -05:00
Neel Chauhan
777d90fa23 Check for leading zeros in tor_inet_aton() 2020-02-11 08:47:13 -05:00
Nick Mathewson
d9a70ba212 Merge remote-tracking branch 'tor-github/pr/1690/head' 2020-02-11 08:45:25 -05:00
Nick Mathewson
48bf3aec25 Merge branch 'maint-0.4.3' 2020-02-11 08:44:39 -05:00
Nick Mathewson
409e1ca3d5 Merge remote-tracking branch 'tor-github/pr/1716/head' into maint-0.4.3 2020-02-11 08:44:18 -05:00
Nick Mathewson
1ca6c52209 Merge branch 'maint-0.4.3' 2020-02-11 08:35:22 -05:00
Christian Clauss
9f7e1ccacb Undefined name: make_key() -> make_rsa_key() 2020-02-11 08:35:11 -05:00
Nick Mathewson
71d96cefc0 Update to 0.4.4.0-alpha-dev 2020-02-10 19:43:54 -05:00
Nick Mathewson
dac185edba Merge branch 'maint-0.4.3' 
"ours" merge to avoid version bump.
 2020-02-10 19:43:17 -05:00
Nick Mathewson
5d56c1f4b2 Update to 0.4.3.2-alpha-dev 2020-02-10 19:42:31 -05:00
George Kadianakis
901ed35709 Make n_subcredentials a size_t . 
Based on David's review.
 2020-02-11 02:13:40 +02:00
Taylor Yu
dfa1800c7f changes file for ticket 33213 2020-02-10 14:24:44 -06:00
swati
725b0528e3 Alphabetized Server Options and Directory Server Options 2020-02-11 01:41:43 +05:30
Nick Mathewson
dcbf6611d9 Correction to changelog from dgoulet 2020-02-10 15:02:32 -05:00
Nick Mathewson
2571d8e7fe One more light changelog edit. 2020-02-10 15:01:02 -05:00
Nick Mathewson
f275a9ada7 Light edits on the 0.4.3.2-alpha changelog 2020-02-10 14:40:19 -05:00
Nick Mathewson
a0ca442b79 start on 0.4.3.2-alpha changelog 2020-02-10 14:30:36 -05:00
Nick Mathewson
eb8841cd95 Merge branch 'bug33104_041' 2020-02-10 14:23:13 -05:00
Nick Mathewson
0c90fc37ec Merge branch 'maint-0.4.1' into maint-0.4.2 2020-02-10 14:17:10 -05:00
Nick Mathewson
71c49f7356 Merge branch 'maint-0.4.0' into maint-0.4.1 2020-02-10 14:17:10 -05:00
Nick Mathewson
d9144700af Merge branch 'maint-0.4.2' 2020-02-10 14:17:10 -05:00
Nick Mathewson
f3fa22bf1b Merge branch 'maint-0.3.5' into maint-0.4.0 2020-02-10 14:17:09 -05:00
Nick Mathewson
2b6df3da21 Merge branch 'bug33212_035' into maint-0.3.5 2020-02-10 14:17:03 -05:00
Nick Mathewson
dab0b1c3a7 bump to 0.4.3.2-alpha 2020-02-10 13:37:59 -05:00
Nick Mathewson
99d044d553 Fix a Rust compilation warning; resolve bug 33212. 2020-02-10 13:32:09 -05:00
Nick Mathewson
3b62cd85e2 clang-format: remove StatementMacros usage 
This change lets us use clang-format-6.0, and is okay since we now
require semicolons after HT_PROTOTYPE/GENERATE.
 2020-02-10 12:55:00 -05:00
Nick Mathewson
d9e211ab70 Use semicolons after HT_PROTOTYPE and HT_GENERATE. 2020-02-10 12:54:43 -05:00
Nick Mathewson
a9cc4ce0eb ht.h: Require a semicolon after HT_PROTOTYPE and HT_GENERATE[2] 2020-02-10 12:54:06 -05:00
Nick Mathewson
b2c3cb1b26 Add tests for control_event_signal. 2020-02-10 11:38:36 -05:00
Nick Mathewson
05a05773f2 Merge remote-tracking branch 'tor-github/pr/1711' 2020-02-10 10:23:50 -05:00
teor
5e6021bdae
stats: Fix a function comment typo in rephist.c 
Comment-only change.
 2020-02-10 15:58:25 +10:00
Taylor Yu
cb757b30a2 changes file for tickets 32928, 32929 2020-02-07 12:54:55 -06:00
swati
305934c67b Updated introductory text for CIRCUIT TIMEOUT and DORMANT MODE options 2020-02-07 16:36:09 +05:30
Nick Mathewson
fbc1eaa0af Try to shorten an #error in address.c 2020-02-06 17:21:34 -05:00
Nick Mathewson
1651f92c16 Break CONNECTION_TESTCAE_ARG across multiple lines 2020-02-06 17:21:34 -05:00
Nick Mathewson
8a5a1600cd Extract verbatim table in uname.c 2020-02-06 17:06:12 -05:00
Nick Mathewson
5fa62fffee checkSpace: permit wide lines for LCOV_EXCL 
We're telling clang-format that a line with LCOV_EXCL must not be
split -- that's fine, but we shouldn't complain when it indents it.
 2020-02-06 16:25:56 -05:00
Nick Mathewson
7036ed3471 Fix a couple more long warning lines 
These are not a problem with 2-space indentation, but cocci will
start getting confused when clang-format wraps them with 4-space
indentation.
 2020-02-06 16:25:56 -05:00
Nick Mathewson
6076adde25 circuitbuild: expect bug message that clang-format will generate. 
clang-format wants to put no space here, so we need to tell the test
to expect a lack of a space.
 2020-02-06 15:34:06 -05:00
Nick Mathewson
f39ba52029 checkSpace: be more careful about bad function headers. 
Previously we would forbid macro indentations like this:

FOO({
  int x;
  })

But clang-format sometimes generates those.
 2020-02-06 14:54:04 -05:00
Nick Mathewson
99a5aecbc7 Wrap columnar tables in "clang-format off/on" 
These tables have aligned comments, so we don't want clang-format to
mess with them.
 2020-02-06 14:54:04 -05:00
Nick Mathewson
06a6130666 Use parentheses to avoid mis-indentations of stringified macro args 
clang-format sometimes thinks that "#name" should be written as
"#     name" if it appears at the start of a line.  Using () appears
to suppress this, while confusing Coccinelle.
 2020-02-06 14:54:04 -05:00
Nick Mathewson
6104c407e0 maps: do not include _ as part of expected prefix in macros. 
Doing this makes our macro usage a little clear IMO, and also avoids
having to use an unadorned "new" within a macro.  (Clang-format
seems to think that "new" means we're doing C++, and so it generates
some output that checkSpace.pl doesn't care for.)
 2020-02-06 14:54:04 -05:00
Nick Mathewson
87b71a692a Remove senseless CHECK_PRINTF()s from util_bug.c 
These belong in util_bug.h (and they already are there).

Their presence made clang-format misindent these functions in a way
that checkSpace.pl dislikes.
 2020-02-06 14:54:04 -05:00
Nick Mathewson
efa5020a9c log_test_helpers: remove semicolons from end of macros 
We want our code to require semicolons after use of these macros,
so that our code formatters and/or analysis tools don't get
confused.
 2020-02-06 14:54:04 -05:00
Nick Mathewson
60f01da78e Use smaller CPP error messages 
Clang-format wants to split these messages across multiple lines,
which confuses the heck out of coccinelle.
 2020-02-06 14:54:04 -05:00
Nick Mathewson
e9b663beaf onion_queue.c: use TAILQ_HEAD less confusingly. 
When we use macro inline, clang-format likes to break it in the
middle, which makes checkSpace get confused.
 2020-02-06 14:33:05 -05:00