nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
34,198 Commits 53 Branches 630 Tags 128 MiB
825f52784d
Commit Graph

34198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
teor
825f52784d
Merge remote-tracking branch 'tor-github/pr/1535' 2019-11-15 12:11:32 +10:00
teor
b58e5091b7
Merge remote-tracking branch 'tor-github/pr/1533' 2019-11-15 12:11:22 +10:00
teor
d8d36c7dc3
Merge remote-tracking branch 'tor-github/pr/1536' 2019-11-15 11:28:29 +10:00
Nick Mathewson
d57a04b648 Avoid redundant typedef of or_options_t and smartlist_t in *_config.h 
Fixes bug 32495.
 2019-11-14 15:43:53 -05:00
David Goulet
196be8ca26 Merge branch 'tor-github/pr/1537' 2019-11-14 12:59:28 -05:00
Nick Mathewson
cf79ffaf1e Fix 32-bit warnings in test_circuitmux.c 
Fixes bug 32496; bug not in any released Tor.
 2019-11-14 11:04:10 -05:00
David Goulet
1371d29e5b Merge branch 'tor-github/pr/1489' 2019-11-14 10:37:14 -05:00
Nick Mathewson
a76b7cd8b5 Merge remote-tracking branch 'tor-github/pr/1531' 2019-11-14 09:58:37 -05:00
teor
d19f370aa2 Run "make autostyle" 2019-11-14 16:28:39 +10:00
teor
0df8bcfb6f relay: Disable relay_sys when the relay module is disabled 
Closes ticket 32245.
 2019-11-14 16:27:06 +10:00
teor
88c2a23c4b relay: Disable relay_periodic when the relay module is disabled 
Closes ticket 32244.
 2019-11-14 16:17:17 +10:00
teor
3b4a360ed0
practracker: Don't read editor temp files, attempt 2 
(Or any files that start with "." or "#".)

Obviously correct changes to already-reviewed code.
 2019-11-14 16:12:19 +10:00
teor
ef00b1ce0f dirauth: Remove a HAVE_MODULE_DIRAUTH inside a function 
There are now no HAVE_MODULE_{DIRAUTH,RELAY} inside functions.

Closes ticket 32163.
 2019-11-14 15:43:27 +10:00
teor
b2b61b0268
changes: Update the changes file for 32410 
When the relay module is disabled, we change the ClientOnly
default to 1. But we forgot to mention that in the changes file.
 2019-11-14 15:39:40 +10:00
teor
9f37c0f4f2
changes: file for 32451 2019-11-14 13:12:42 +10:00
teor
aa3e2bbd4b test/parseconf: Warn when the expected_log* file is missing 
Part of 32451.
 2019-11-14 12:57:59 +10:00
teor
ced434c586 test/parseconf: Update conf_examples to use expected_log 
Part of 32451.
 2019-11-14 12:57:34 +10:00
teor
c7838c71fb test/parseconf: Add failure cases in conf_failures/ 
These failure cases can be used to test the failure behaviour
and failure logs of test_parseconf.sh.

See the README for details.

Part of 32451.
 2019-11-14 11:57:50 +10:00
teor
51a6c0c8fd test/parseconf: Stop adding newlines to *_printf 
Cleanup after 32451.
 2019-11-14 11:57:50 +10:00
teor
2c4ada729e test/parseconf: Show tor command lines on failure 
Part of 32451.
 2019-11-14 11:57:50 +10:00
teor
a5628cf5b3 test/parseconf: Refactor and simplify, stage 2 
Remove more duplicate code.
Eliminate some arguments.
Rewrite some comments.

Cleanup after 32451.
 2019-11-14 10:55:21 +10:00
teor
39046019ec test/parseconf: Refactor and standardise, stage 1 
Remove duplicate code, and standardise similar behaviour.
Add some additional error checking.

Cleanup after 32451.
 2019-11-14 10:55:21 +10:00
teor
b4b3060f69 test/parseconf: Rename some functions, and reformat 
Part of 32451.
 2019-11-14 10:55:21 +10:00
teor
e6ca32fae3 test/parseconf: Use consistent formatting 
Make spacing, quotes, and env vars consistent.

Cleanup after 32451 and 32468.
 2019-11-14 10:55:21 +10:00
teor
4514bfe9c2 test/parseconf: Stop ignoring --dump-config failures 
When we added the $FILTER for Windows newlines, we made
the pipeline always exit successfully, even if tor failed.

Fixes bug 32468; bugfix on 0.4.2.1-alpha.
 2019-11-14 10:55:21 +10:00
teor
7ef44100c4 test/parseconf: Standardise output messages 
Part of 32451.
 2019-11-14 10:55:21 +10:00
teor
3df6432006 test/parseconf: Add an expected_log file 
The "expected_log" file is a set of patterns that matches the
output of "tor --verify-config". Unlike "error", it expects a
successful exit status.

Part of 32451.
 2019-11-14 10:55:21 +10:00
teor
4cf5d4cb3c test/parseconf: Rewrite the included files section 
Part of 32451.
 2019-11-14 10:55:21 +10:00
teor
735d5f5b7e test/parseconf: Split the file list into sections 
There are lots of different files now, so having Config and Result
sections is helpful.

Part of 32451.
 2019-11-14 10:55:21 +10:00
Nick Mathewson
79bac44293 Remove changes files that are already merged into 0.4.2.4-rc. 2019-11-12 16:48:12 -05:00
Nick Mathewson
cd4ae97448 Merge branch 'maint-0.4.2' 
"ours" to avoid version bump.
 2019-11-12 16:39:44 -05:00
Nick Mathewson
70755eca00 Bump version to 0.4.2.4-rc. 2019-11-12 16:39:37 -05:00
Nick Mathewson
fc1316b559 Merge branch 'ticket32467' 2019-11-12 13:19:12 -05:00
Nick Mathewson
f221a7aaf6 Fold remainder of this-not-that.md into CodingStandards.md 2019-11-12 12:28:14 -05:00
Nick Mathewson
c11c1d0623 Merge remote-tracking branch 'tor-github/pr/1367' 2019-11-12 12:18:14 -05:00
Nick Mathewson
e39423c78c Remove 01e-os-compat: the module docs cover this much better. 2019-11-12 12:14:56 -05:00
Nick Mathewson
6744f6b6bb HACKING/design: move 01c-time.md into doxygen. 2019-11-12 12:14:14 -05:00
Nick Mathewson
b0f9ecdbb1 Move 01g-strings.md into doxygen. 2019-11-12 12:09:53 -05:00
Nick Mathewson
d1a1631a05 01f-threads.md becomes threading.dox. 2019-11-12 12:05:05 -05:00
Nick Mathewson
91f377deec HACKING/design: turn the remaining parts of crypto into a certs doc 2019-11-12 12:01:33 -05:00
Nick Mathewson
89396bc726 HACKING/design: remove 03-modules as superseded. 
The src/feature directory documentation now covers this better.
 2019-11-12 11:56:53 -05:00
Nick Mathewson
6d9db29dda Document --dump-config. 
Closes ticket 32467.
 2019-11-12 08:19:35 -05:00
teor
233ccef6d8
Merge branch 'maint-0.4.2' 2019-11-12 10:10:01 +10:00
teor
9be51e8a8e
test/parseconf: Add tests for ignored options 
These tests will also pass on 0.4.3, with the original implementation,
and with the new implementation in 32404.

Part of 32295 and 32404.
 2019-11-12 10:09:40 +10:00
teor
3d6ec40e6a
Merge branch 'maint-0.4.2' 
"git merge --strategy ours", because:
* 32295 is a quick fix for 0.4.2 only
* 32404 has a better implementation for master
 2019-11-12 10:07:46 +10:00
teor
2ee04fc309
config: Log the option name when skipping an obsolete option 
This is a basic fix for 0.4.2 only. The fix for 0.4.3 and later
is in 32404.

Fixes bug 32295; bugfix on 0.4.2.1-alpha.
 2019-11-12 10:07:12 +10:00
Nick Mathewson
3d1a7d7dd7 Light grammar edits 2019-11-11 12:26:09 -05:00
Nick Mathewson
7c3378fb8d Merge remote-tracking branch 'tor-github/pr/1338' 2019-11-11 12:20:14 -05:00
Nick Mathewson
01af3a55f4 Merge remote-tracking branch 'tor-github/pr/1524' 2019-11-11 11:57:31 -05:00
Nick Mathewson
4462766d32 Merge branch 'ticket32404' 2019-11-11 11:54:14 -05:00