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

955 Commits

Author SHA1 Message Date
Nick Mathewson
1cce0588e1 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-09-21 12:59:03 -04:00
Nick Mathewson
679ba1a226 Merge branch 'maint-0.4.4' 2020-09-21 12:59:03 -04:00
Nick Mathewson
1bbeddf99e Add a few more options for the CI script. 
These are:
  --disable-module-relay
  --disable-module-dirauth
  --enable-all-bugs-are-fatal
  --enable-nss
 2020-09-21 12:58:49 -04:00
Nick Mathewson
b643ced022 Merge branch 'maint-0.3.5' into maint-0.4.3 2020-09-18 19:06:16 -04:00
Nick Mathewson
09813fe31e Merge branch 'maint-0.4.3' into maint-0.4.4 2020-09-18 19:06:16 -04:00
Nick Mathewson
4ae881928b Add TOR_TRACE_LIBS to fuzzing_include_am.py 
(It looks like it was forgotten previously)
 2020-09-18 16:08:29 -04:00
Nick Mathewson
e9dbb5e395 Build one big .a library full of Tor's implementation. 
This is experimental and probably will break some platforms
 2020-09-18 16:08:24 -04:00
Nick Mathewson
122b297a20 Copy tracing things back to maint-0.3.5, for consistency. 2020-09-18 15:53:06 -04:00
Nick Mathewson
ca389d22a1 Remove 0.4.2 from list of branches in git script: it has reached EOL. 2020-09-15 09:00:44 -04:00
David Goulet
20a990cea3 ci: Add tracing build to Gitlab CI 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-08-25 10:38:48 -04:00
Daniel Pinto
ebaa1a1d23 Make options_init_from_torrc smaller #40102 
Split implementation of several command line options from
options_init_from_torrc into smaller isolated functions.
 2020-08-14 16:01:02 +01:00
Nick Mathewson
34919368ce Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-12 20:21:04 -04:00
Nick Mathewson
9d77ed7be2 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-12 20:21:04 -04:00
Nick Mathewson
effc9739bf Merge branch 'maint-0.4.4' 2020-08-12 20:21:04 -04:00
Nick Mathewson
07f0210a05 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-12 20:21:04 -04:00
Nick Mathewson
41a7ab96e5 CI: Turn on stem with 044 and later. 2020-08-12 20:13:18 -04:00
Nick Mathewson
e151442037 Merge remote-tracking branch 'tor-gitlab/mr/62' 2020-08-12 14:37:21 -04:00
Nick Mathewson
309eafbc3c Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-12 12:29:17 -04:00
Nick Mathewson
f98b1988ec Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-12 12:29:17 -04:00
Nick Mathewson
02bb719a94 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-12 12:29:17 -04:00
Nick Mathewson
11f1fe3aca Merge branch 'maint-0.4.4' 2020-08-12 12:29:17 -04:00
Nick Mathewson
f5b9471547 CI: improve output when skipping doxygen 2020-08-12 12:28:44 -04:00
Nick Mathewson
50b7bd243f Try disabling "make all" when checking docs. 2020-08-12 12:28:44 -04:00
Nick Mathewson
fe0e62ddc4 CI: Try to enable integration tests, hardening, and clang. 2020-08-12 11:29:46 -04:00
Nick Mathewson
0ec2d1528c Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-11 12:37:08 -04:00
Nick Mathewson
c6c0af403c Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-11 12:37:08 -04:00
Nick Mathewson
2b968446d9 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-11 12:37:08 -04:00
Nick Mathewson
da9684d89a Merge branch 'maint-0.4.4' 2020-08-11 12:37:08 -04:00
Nick Mathewson
adb7268236 CI: label our python versions. 2020-08-11 12:24:03 -04:00
Nick Mathewson
9eb316de42 CI: Only run doxygen on 0.4.3 and later. 2020-08-11 12:22:35 -04:00
Nick Mathewson
e4ef3c61f7 Merge branch 'maint-0.4.4' 2020-08-11 11:03:25 -04:00
Nick Mathewson
6bee9bd481 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-11 11:03:24 -04:00
Nick Mathewson
da8577bb75 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-11 11:03:24 -04:00
Nick Mathewson
673d02bdb0 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-11 11:03:24 -04:00
Nick Mathewson
aa2c93b90b Fix a pair of typos in ci-driver.sh. 2020-08-11 11:03:11 -04:00
Nick Mathewson
2a7e71c956 Fix "run_check_subsystem_order.sh" to use $PYTHON. 
Previously it just used /usr/bin/env/python, which would fail if we
only had a "python3" binary.

Fixes bug 40095; bugfix on 0.4.4.1-alpha.
 2020-08-11 11:01:31 -04:00
Nick Mathewson
0ee3b83a0b Merge branch 'maint-0.4.4' 2020-08-11 10:44:40 -04:00
Nick Mathewson
262ddfee7a Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-11 10:44:40 -04:00
Nick Mathewson
e4a6d9d5a9 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-11 10:44:40 -04:00
Nick Mathewson
d83703317d Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-11 10:44:40 -04:00
Nick Mathewson
8a0f530adf Add a pair of warnings about only editing CI in 035 2020-08-11 10:44:32 -04:00
Nick Mathewson
069946852a Merge branch 'maint-0.4.4' 2020-08-10 19:33:07 -04:00
Nick Mathewson
7d80bf80fe Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-10 19:33:07 -04:00
Nick Mathewson
f3fcc89d05 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-10 19:33:06 -04:00
Nick Mathewson
68f8250cbb Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-10 19:32:49 -04:00
Nick Mathewson
cb027b392f Add a shareable continuous-integration script. 
Eventually this should be used by every one of our CI scripts.
 2020-08-10 19:01:05 -04:00
Daniel Pinto
ccdd0d801a Minor style improvements. #30045 2020-08-03 20:08:17 +01:00
Daniel Pinto
1474ab3395 Add --format argument to --key-expiration option. #30045 2020-08-01 01:08:37 +01:00
Nick Mathewson
d6570eaf5d Merge remote-tracking branch 'tor-gitlab/mr/59' 2020-07-20 16:37:11 -04:00
Alexander Færøy
b18e274919 Merge branch 'tor-gitlab/mr/66' 2020-07-20 14:22:29 +00:00
Alexander Færøy
8638723d57 Merge branch 'tor-gitlab/mr/65' 2020-07-20 14:19:45 +00:00
Daniel Pinto
29307c0625 Add running glibc version to the log. #40047 
Also adds the compiled and running glibc version when using the
--library-versions flag.
 2020-07-17 18:45:57 +01:00
Nick Mathewson
0401993197 Add git-resquash.sh to repository 
This differs from my old git-resquash.sh in that it uses the newer
`git rebase --keep-base` if available
 2020-07-17 12:24:01 -04:00
Nick Mathewson
09601c3c4d Use gitlab-friendly URLs when formatting changelogs as HTML 
Our old https://bugs.torproject.org/nnnn URLs only work for bugs
numbered before 40000.  Newer gitlab bugs need to have specific
projects mentioned.

This patch assumes that bugs are in tpo/core/tor by default, but
allows us to refer to several other projects by saying
e.g. "chutney#40002" if we want.
 2020-07-17 09:31:32 -04:00
Daniel Pinto
34fa2c4d0d Add support for patterns on %include #25140 
Also adds generic tor_glob function to expand globs.
 2020-07-15 22:01:08 +01:00
David Goulet
456be93956 doc: Move manpages into doc/man/ 
Closes #40044

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-07-14 09:02:03 -04:00
Nick Mathewson
6fb1637255 Merge remote-tracking branch 'tor-gitlab/mr/29' 2020-07-10 12:53:46 -04:00
Nick Mathewson
18391f689e git-install-tools: use -b, not --backup. 
The osx version of this tool doesn't have --backup
 2020-07-09 17:12:37 -04:00
Nick Mathewson
97a9966b04 Update git scripts to include tor-gitlab repository 
Analogously to tor-github, we now make a tor-gitlab repository.  It
is set up to disable push direct attempts, and to fetch merge
requests into appropriate branches.

git-pull-all.sh knows how to fetch this repository.
 2020-07-09 14:27:10 -04:00
David Goulet
d80c34d214 trace: Move LTTng specific declartion to .inc file 
LTTng tracepoint probe declaration is not really following a C standard that
coccinelle and checkSpace.pl likes.

Move everything to a .inc file and standardize the trace_probes_circuit.h
header to include that LTTng specific file if the instrumentation was enabled
at configure time.

Part of #32910

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-07-08 09:18:33 -04:00
David Goulet
bf0e2ae0d0 trace: Add single tracepoint in circuit subsystem 
This is the very first tracepoint in tor. It is in the circuit subsystem for
when a new circuit opens.

LTTng instrumentation requires lot more around a tracepoint than USDT thus
this commit only adds one tracepoint in order to outline a base to add more
tracepoints later.

The idea is that we separate subsystem into what LTTng defines as "providers"
so the circuit provider contains the tracepoint definitions for the circuit
subsystem.

Signed-off-by: David Goulet <dgoulet@torproject.org>

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-07-08 09:10:08 -04:00
George Kadianakis
3bb9b7e743 Merge branch 'tor-github/pr/1934' 2020-07-03 10:50:47 +03:00
David Goulet
887dc6abb0 scripts: Don't run practracker in git hooks 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-07-02 14:39:44 -04:00
David Goulet
8ae0ecbd6a scripts: Add env variable to disable pre-commit hook 
We introduce TOR_EXTRA_PRE_COMMIT_CHECKS environment variable to run the
pre-commit hook. The pre-push git hook will set it in order to run all
pre-commit checks.

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-07-02 14:39:44 -04:00
Nick Mathewson
8f362b7bce Extract extend_info manipulation functions into a new file. 2020-07-02 09:51:03 -04:00
David Goulet
7a6e1f2491 scripts: Fix rename_c_identifier.py uncommitted warning 
Only warn when we actually want a commit _and_ there are uncommitted changes
found. Else, it is fine to rename if the script is not creating a commit.

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-06-30 13:48:22 -04:00
David Goulet
86da0cfd36 Merge branch 'tor-github/pr/1945' 2020-06-24 13:51:51 -04:00
George Kadianakis
279225acdd Merge branch 'tor-github/pr/1929' 2020-06-24 17:20:25 +03:00
David Goulet
6da8c0b4fa addr: Rename resolve_my_address to be v4 specific 
Part of #33233

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-06-23 09:25:36 -04:00
Mike Perry
c047c6d5b8 practracker FTL! 
Faster Than Light!
 2020-06-16 13:44:10 -05:00
George Kadianakis
3cb77a9cca Merge branch 'maint-0.4.4' 2020-06-11 17:29:54 +03:00
Nick Mathewson
f3c82c86f9 Improve our clang-format.sh script 
Previously, this script ran over every C file in our source code,
which took up to a minute on my desktop.

Instead, the script now has several modes that it can run in, to
minimize the time spent and improve useful output.  It should now be
suitable for everyday use and git hooks.  I hope.

I've also renamed this script, so that we can keep using it in the
future if we were to move to some tool other than clang-format.
 2020-06-11 10:28:03 -04:00
George Kadianakis
52edea121e Fold in a changes file and update exceptions.txt. 
Co-authored-by: Florentin Rochet <florentin.rochet@uclouvain.be>
 2020-06-11 16:13:25 +03:00
Nick Mathewson
fc16dbf7aa Remove "enable_practracker_in_hooks" for 0.4.4. 2020-06-09 15:47:25 -04:00
Nick Mathewson
354f085e5f Merge remote-tracking branch 'tor-github/pr/1888/head' 2020-06-09 15:44:58 -04:00
Nick Mathewson
eaae5625cb Add 0.4.4 to list of tor branches used by git scripts. 2020-06-09 14:17:15 -04:00
Nick Mathewson
ca8b04f194 Merge branch 'ticket34375' 2020-06-09 14:16:21 -04:00
c
76d07940fd
scripts/maint: Remove obsolete generated tor.sh 
Per <https://trac.torproject.org/projects/tor/ticket/34381>, these
contrib scripts were generated by older versions of Tor and shellcheck
will throw warnings if they still exist.
 2020-06-08 01:41:36 +00:00
Nick Mathewson
811853c677 Remove 0.4.1 from list of tor branches used by git scripts. 2020-06-03 14:54:21 -04:00
teor
8ec4d9cc3c practracker: Accept extra file lines, enforce a smaller function 
Accept extra lines in nodelist and routerlist due to extra features, and
due to refactors that simplify some functions.

Most of the refactor eliminated duplicate code in smaller functions, so
there's only one large function that got smaller.

Part of 34200.
 2020-05-18 21:53:52 +10:00
Nick Mathewson
bbfdee4c4e Fix a python warning in format_changelog.py. 2020-05-14 10:37:52 -04:00
teor
de979dd7bd practracker: Allow a few extra lines in circuituse 
Part of 33222.
 2020-05-13 20:08:29 +10:00
teor
b64972edcd practracker: Accept extra or.h lines 2020-05-11 14:39:42 +10:00
teor
24099680f1 Appease practracker: wrapping costs lines 2020-05-07 20:19:19 +10:00
David Goulet
a25f167072 config: New file resolve_addr.{c|h} 
Move a series of function from config.c into that new file which is related to
address resolving.

Part of #33789

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-05-05 14:24:04 -04:00
teor
a202f03c64 practracker: Accept some wrapped long lines 
Part of 33222.
 2020-04-30 15:15:53 +10:00
teor
efcae919ae
practracker: Accept the connection buf refactor 
Accept a few extra lines from the connection_buf_read_from_socket()
refactor.

Cleanup after 33131.
 2020-04-30 13:55:26 +10:00
teor
ed4420b4b8 practracker: Allow an extra line in tor_addr_parse_mask_ports() 
We added a cast, and wrapped a line.
 2020-04-30 06:54:42 +10:00
teor
f5c34d340d
Run practracker regen 
Lock-in improvements.
Accept some small function size increases.
Allow a small amount of extra file size increase.
 2020-04-14 15:42:52 +10:00
Nick Mathewson
80031db32a Merge remote-tracking branch 'tor-github/pr/1801/head' 2020-04-09 11:50:20 -04:00
teor
75aba30abf relay: Run practracker --regen 
Lock in some file and function size improvements.

Accept some small file size and dependency increases.

Part of 33633.
 2020-04-09 11:00:04 +10:00
teor
065ccda4f6
Merge branch 'pr1838_squashed' 2020-04-07 17:36:17 +10:00
Nick Mathewson
ea9ff58921
Try rewriting normalize_srcdir to normalize harder. 2020-04-07 17:36:05 +10:00
Nick Mathewson
d3db84c1e7
Make check_subsystem_order work in distcheck builds. 2020-04-07 17:36:02 +10:00
Nick Mathewson
5f49695f94
Make check_subsystem_order work in out-of-tree builds. 2020-04-07 17:35:58 +10:00
Nick Mathewson
9b434b79ce
Add a test script to check subsystem order as part of make check. 2020-04-07 17:35:51 +10:00
teor
a762234ba2
scripts: Ignore editor temporary files 
Ignore editor temporary files when autostyling in:
* rectify_include_paths.py
* rename_c_identifier.py

Obviously correct changes to already-reviewed code.
 2020-04-03 19:16:57 +10:00
Nick Mathewson
978b7ef45c Teach --check-subsystem-order to take input from stdin 2020-03-26 12:30:30 -04:00
Nick Mathewson
a40d539f7c Extend includes.py to compare topology with subsystem init order. 2020-03-26 12:17:53 -04:00
teor
a34a88c6f1
practracker: Accept changes 
Accept a smaller file and function.
Let router.c grow slightly without warning.
Accept an extra comment line.

Cleanup after 32588.
 2020-03-21 04:10:24 +10:00