3864536b7c
scripts/git: Remove extra printfs from a bad merge
2019-11-07 12:04:22 +10:00
57f43bcb03
Run "make autostyle"
2019-11-07 10:56:17 +10:00
e466c84ed3
Merge branch 'maint-0.4.2'
2019-11-07 10:51:48 +10:00
1f3bf10d3f
Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.4.2
2019-11-07 10:51:22 +10:00
10982d5997
Merge remote-tracking branch 'tor-github/pr/1512'
2019-11-07 10:35:50 +10:00
aebde73629
Merge branch 'ticket32386'
2019-11-06 18:29:16 -05:00
58d7f9e68b
Remove Makefile from doc/HACKING/design
2019-11-06 15:47:29 -05:00
83cab05398
Remove 00-overview.md as already subsumed by doxygen
2019-11-06 15:47:00 -05:00
9687efb386
Add a bunch of doxygen for things in src/lib.
2019-11-06 14:40:20 -05:00
b994397f1a
entrynodes.h: make a comment into doxygen.
2019-11-06 13:08:04 -05:00
9663ac0027
int_type_params_t: add documentation.
2019-11-06 13:07:13 -05:00
88796637e5
dispatch_cfg_st.h: make comments into doxygen.
2019-11-06 13:05:36 -05:00
c6c02658cf
hs_ident.c: make comments into doxygen.
2019-11-06 13:05:13 -05:00
92b3f60ebc
hs_ident.h: make comments into doxygen.
2019-11-06 13:03:40 -05:00
2ab5b7520e
Add missing **/ to core_or.dox
2019-11-06 12:56:02 -05:00
3ae87c3c7f
Turn the "dataflow" document into a doxygen page.
2019-11-06 12:50:57 -05:00
4d70e725d1
Do not try to shut down the event loop when it is not initialized.
...
Doing so caused us to crash in some unusual circumstances, such as
using --verify-config to verify a configuration that failed during
the options_act() stage.
Fixes bug 32407; bugfix on 0.3.3.1-alpha.
2019-11-06 11:33:23 -05:00
65013a6924
changes: Add file for ticket #31371
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-11-06 10:27:34 -05:00
49cb7d6ec4
Merge branch 'tor-github/pr/1491'
2019-11-06 10:23:33 -05:00
059a5795d3
Merge branch 'maint-0.4.2'
2019-11-06 08:57:21 -05:00
8f6dc54e3c
Merge remote-tracking branch 'tor-github/pr/1495' into maint-0.4.2
2019-11-06 08:57:14 -05:00
1ee17dc07a
OwningControllerFD should be immutable, not OwningControllerProcess.
...
This is a mistake I made when marking options as immutable.
Fixes bug 32399. Bug not in any released Tor.
2019-11-06 08:37:32 -05:00
1407e2b169
test: Fix DoS heartbeat unit test after adding INTRO2
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-11-06 08:09:35 -05:00
22482fd454
test/parseconf: Add support for optional library variants
...
test_parseconf.sh now supports:
* {error,expected}{,_lzma,_nss,_zstd}{,_no_dirauth,_no_relay_dirauth}
Or any combination of two or more optional libraries.
Closes ticket 32397.
2019-11-06 21:36:42 +10:00
85e566a6a0
Merge branch 'maint-0.4.2'
2019-11-06 21:30:44 +10:00
89f52f36e0
Merge remote-tracking branch 'tor-github/pr/1510'
2019-11-06 21:29:18 +10:00
c3a1e15a5e
Merge remote-tracking branch 'tor-github/pr/1509' into maint-0.4.2
2019-11-06 21:28:28 +10:00
23ff60c150
Merge branch 'maint-0.4.2'
2019-11-06 17:04:52 +10:00
e6b5a1ff93
shellcheck: Fix minor issues in some scripts
...
Fix minor issues in git-push-all.sh, git-setup-dirs.sh and
test_parseconf.sh.
Fixes bug 32402; not in any released version of tor.
Obviously correct changes to already reviewed code.
2019-11-06 16:21:01 +10:00
f7b45975bf
Merge branch 'bug32402_042' into bug32402_master
...
Merge changes from master with shellcheck fixes.
2019-11-06 16:14:06 +10:00
7f23d47f72
shellcheck: Fix issues in the git-*.sh scripts
...
Fixes bug 32402; bugfix on 0.4.2.1-alpha.
Obviously correct changes to already reviewed code.
2019-11-06 16:09:31 +10:00
57baea701f
shellcheck: Start checking most scripts for errors
...
This check was accidentally disabled by a bad find command.
Fixes bug 32402; bugfix on 0.4.2.1-alpha.
Obviously correct changes to already reviewed code.
2019-11-06 15:49:50 +10:00
bf5b17d8bb
configure: Fix variable name typos
...
The "if-present" clause of AC_ARG_ENABLE() sets enable_{lzma,zstd},
so we don't need to set it. The "if-not-present" clause needs to set
enable_{lzma,zstd}, rather than just {lzma,zstd}.
The rest of the script only ever checks for enable_{lzma,zstd} = no,
so these changes do not actually change the behaviour of configure.
Fixes bug 32401.
2019-11-06 14:08:07 +10:00
10ef7a31cf
Makefile: Fix "make check-includes" for out-of-tree builds
...
Previously, it would run on the build tree, which did not contain
any sources.
Fixes bug 31335; bugfix on 0.3.5.1-alpha.
2019-11-06 12:30:19 +10:00
9ca25f3a68
Merge branch 'maint-0.4.2'
2019-11-06 11:20:02 +10:00
76fd872db8
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-11-06 11:19:54 +10:00
de6ceb0bee
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-11-06 11:19:46 +10:00
03e77ef036
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-11-06 11:19:38 +10:00
1bde356bf6
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-11-06 11:19:30 +10:00
4f9a003392
Merge remote-tracking branch 'tor-github/pr/1374' into maint-0.4.1
2019-11-06 11:19:13 +10:00
4abfcb7997
Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5
2019-11-06 11:18:09 +10:00
0e2834a371
Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5
2019-11-06 11:17:43 +10:00
d2e4262ebc
Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5
2019-11-06 11:17:01 +10:00
6bfdd09679
Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5
2019-11-06 11:16:09 +10:00
0650bf3695
Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9
2019-11-06 11:15:45 +10:00
c06d540ff9
Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9
2019-11-06 11:14:53 +10:00
de4ffebcf0
Doxygen: set HIDE_SCOPE_NAMES.
...
This option tells doxygen to describe a member "member" of a struct
"container" as "member", not "container::member". C doesn't use
the :: syntax, so this should help us with readability.
2019-11-05 12:43:38 -05:00
36bceacdcd
Doxygen: set TYPEDEF_HIDES_STRUCT.
...
This option tells doxygen to handle typedef struct foo_t foo_t by
making foo_t and struct foo_t synonymous. This lets doxygen find
documentation that it would otherwise miss: otherwise, if it sees
documentation for "int func(foo_t *)" and a prototype for
"int func(struct foo_t)", it will think that the prototype is
undocumented.
Part of #32386 .
2019-11-05 12:43:21 -05:00
884056ae57
Merge branch 'tor-github/pr/1498'
2019-11-05 09:05:26 -05:00
6c4479a90e
Remove a dot from ALIASES declaration.
2019-11-05 09:02:59 -05:00
teor
Nick Mathewson
David Goulet