aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-07lib/cc: Define the standard C macro pasting trick in one place.Nick Mathewson
This file is a workaround for the issue that if you say `a ## b` to create a token that is the name of a macro, the C preprocessor won't expand that macro. So you can't say this: #define FOO__SQUARE(x) ((x)*(x)) #define FOO__CUBE(x) ((x)*(x)*(x)) #define FOO(func, x) FOO__##func(x) Instead, the standard C trick is to add a layer of indirection: #define PASTE(a,b) PASTE__(a,b) #define PASTE__(a,b) a ## b #define FOO__SQUARE(x) ((x)*(x)) #define FOO__CUBE(x) ((x)*(x)*(x)) #define FOO(func, x) PASTE(FOO__, func)(x) We should use this kind of trick sparingly, since it gets confusing.
2019-11-07Merge remote-tracking branch 'tor-github/pr/1515'Nick Mathewson
2019-11-07scripts/git: Stop failing when upstream branches don't existteor
If you add a custom remote, or a new branch, and don't fetch first, then the script would fail when checking for unchanged branches. Instead, skip the check: a new branch is definitely a change.
2019-11-07scripts/git: Remove extra printfs from a bad mergeteor
2019-11-07test/parseconf: Update config parsing tests for 32410teor
2019-11-07relay: Stop failing on startup when the relay module is disabledteor
When the relay module is disabled, make "ClientOnly 1" and "DirCache 0" by default. (But keep "ClientOnly 0" and "DirCache 1" as the defaults for the unit tests.) And run "make autostyle". Part of ticket 32410.
2019-11-07Run "make autostyle"teor
2019-11-07Merge branch 'maint-0.4.2'teor
2019-11-07Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.4.2teor
2019-11-07Merge remote-tracking branch 'tor-github/pr/1512'teor
2019-11-06Merge branch 'ticket32386'Nick Mathewson
2019-11-06Remove Makefile from doc/HACKING/designNick Mathewson
2019-11-06Remove 00-overview.md as already subsumed by doxygenNick Mathewson
2019-11-06Add a bunch of doxygen for things in src/lib.Nick Mathewson
2019-11-06entrynodes.h: make a comment into doxygen.Nick Mathewson
2019-11-06int_type_params_t: add documentation.Nick Mathewson
2019-11-06dispatch_cfg_st.h: make comments into doxygen.Nick Mathewson
2019-11-06hs_ident.c: make comments into doxygen.Nick Mathewson
2019-11-06hs_ident.h: make comments into doxygen.Nick Mathewson
2019-11-06Add missing **/ to core_or.doxNick Mathewson
2019-11-06Turn the "dataflow" document into a doxygen page.Nick Mathewson
2019-11-06Do not try to shut down the event loop when it is not initialized.Nick Mathewson
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-06changes: Add file for ticket #31371David Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-11-06Merge branch 'tor-github/pr/1491'David Goulet
2019-11-06Merge branch 'maint-0.4.2'Nick Mathewson
2019-11-06Merge remote-tracking branch 'tor-github/pr/1495' into maint-0.4.2Nick Mathewson
2019-11-06OwningControllerFD should be immutable, not OwningControllerProcess.Nick Mathewson
This is a mistake I made when marking options as immutable. Fixes bug 32399. Bug not in any released Tor.
2019-11-06test: Fix DoS heartbeat unit test after adding INTRO2David Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-11-06test/parseconf: Add support for optional library variantsteor
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-06Merge branch 'maint-0.4.2'teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1510'teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1509' into maint-0.4.2teor
2019-11-06Merge branch 'maint-0.4.2'teor
2019-11-06shellcheck: Fix minor issues in some scriptsteor
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-06Merge branch 'bug32402_042' into bug32402_masterteor
Merge changes from master with shellcheck fixes.
2019-11-06shellcheck: Fix issues in the git-*.sh scriptsteor
Fixes bug 32402; bugfix on 0.4.2.1-alpha. Obviously correct changes to already reviewed code.
2019-11-06shellcheck: Start checking most scripts for errorsteor
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-06configure: Fix variable name typosteor
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-06Makefile: Fix "make check-includes" for out-of-tree buildsteor
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-06Merge branch 'maint-0.4.2'teor
2019-11-06Merge branch 'maint-0.4.1' into maint-0.4.2teor
2019-11-06Merge branch 'maint-0.4.0' into maint-0.4.1teor
2019-11-06Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-11-06Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1374' into maint-0.4.1teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9teor
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion