summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2019-09-30Re-run "make autostyle" with improved annotate_ifdef_directivesNick Mathewson
2019-09-30Merge branch 'tor-github/pr/1346'George Kadianakis
2019-09-30Merge branch 'tor-github/pr/1302'George Kadianakis
2019-09-30Merge branch 'tor-github/pr/1356'George Kadianakis
2019-09-30Merge branch 'tor-github/pr/1339'George Kadianakis
2019-09-26Run "make autostyle" with new "annotate_ifdef_directives"Nick Mathewson
2019-09-26Merge remote-tracking branch 'tor-github/pr/1308'Nick Mathewson
2019-09-26lock: Avoid some undefined behaviour when freeing mutexes.teor
Fixes bug 31736; bugfix on 0.0.7.
2019-09-26log: explain why it is safe to leave the log mutex initializedteor
The log mutex is dynamically initialized, guarded by log_mutex_initialized. We don't want to destroy it, because after it is destroyed, we won't see any more logs. If tor is re-initialized, log_mutex_initialized will still be 1. So we won't trigger any undefined behaviour by trying to re-initialize the log mutex. Part of 31736, but committed in this branch to avoid merge conflicts.
2019-09-26sandbox: Allow backtrace signals to be disabledteor
Part of 31614.
2019-09-26backtrace: avoid undefined behaviour on re-initialisationteor
cb_buf_mutex is statically initialised, so we can not destroy it when we are shutting down the err subsystem. If we destroy it, and then re-initialise tor, all our backtraces will fail. Part of 31736, but committed in this branch to avoid merge conflicts.
2019-09-25Merge remote-tracking branch 'tor-github/pr/1349'Nick Mathewson
2019-09-25Merge branch 'tor-github/pr/1334'George Kadianakis
2019-09-25Merge branch 'tor-github/pr/1341'George Kadianakis
2019-09-25Merge branch 'tor-github/pr/1357'George Kadianakis
2019-09-25Merge branch 'tor-github/pr/1345'George Kadianakis
2019-09-25Merge branch 'tor-github/pr/1309'George Kadianakis
2019-09-25test: Use SEVERITY_MASK_IDX() to find the LOG_* mask indexesteor
In the unit tests and fuzzers. Fixes bug 31334; bugfix on 0.2.5.2-alpha.
2019-09-25log: Move SEVERITY_MASK_IDX() to log.hteor
Move SEVERITY_MASK_IDX() to log.h private/unit tests section, so that we can use it in log.c, the unit tests, and the fuzzers. (The test and fuzzer code changes are in a subsequent commit.) Preparation for bug 31334.
2019-09-24feature/control: add a missing word to the send_control_done() commentteor
2019-09-24log: Improve the documentation for tor_log_update_sigsafe_err_fds()teor
Part of 31839.
2019-09-24backtrace: Add a missing check for HAVE_PTHREAD_H before using mutexesteor
Fixes bug 31614; bugfix on 0.2.5.2-alpha.
2019-09-24backtrace: Disable signal handlers in remove_bt_handler()teor
Fixes bug 31614; bugfix on 0.2.5.2-alpha.
2019-09-24test: a file with no config options, at the end of an %include directoryteor
(The file must contain whitespace or comments to trigger the bug.) Regression test for 31408.
2019-09-24Merge branch 'bug31408_035' into bug31408_masterteor
2019-09-23fix typo in commentRoger Dingledine
2019-09-23fix: Ticket #31589AmreshVenugopal
- The function `decrypt_desc_layer` has a cleaner interface. - `is_superencrypted_layer` changed from `int` -> `bool` [ticket details](https://trac.torproject.org/projects/tor/ticket/31589) add(changes/*): changes file fix(src/features/hs): is_superencrypted changed from `int` -> `bool` fix(changes/ticket31589): header add(changes/ticket31589): subsystem(onion services) to change
2019-09-23Fix bug when %including folder with comment only files. #31408Daniel Pinto
When processing a %included folder, a bug caused the pointer to the last element of the options list to be set to NULL when processing a file with only comments or whitepace. This could cause options from other files on the same folder to be discarded depending on the lines after the affected %include.
2019-09-19microdesc_parse: convert some ints to boolsNick Mathewson
Noted by ahf during review of #31675
2019-09-19microdesc_parse: Rename "next" label to "err".Nick Mathewson
2019-09-19Reindent microdesc_parse_fields().Nick Mathewson
I suggest reviewing this with -b: it should be whitespace-only.
2019-09-19Extract field-parsing code for microdesc_parse.cNick Mathewson
The code here parses the fields from the microdescriptor, including possible annotations, and stores them into a microdesc_t object. This commit is almost pure code movement; I recommend using --color-moved to review it.
2019-09-19Reindent microdesc_extract_body().Nick Mathewson
This commit is whitespace-only; I suggest reviewing with -b.
2019-09-19Extract the body-copying portion of microdesc parsingNick Mathewson
This code is logically independent of the rest of the function, and goes better in its own function. This is almost purely code movement; I suggest reviewing with --color-moved.
2019-09-19test: test dirserv_router_has_valid_address() with DirAllowPrivateAddressesteor
Part of 31793.
2019-09-19test: refactor dirserv_router_has_valid_address() teststeor
Cleanup after 31793.
2019-09-19dirauth: reorder the checks in dirserv_router_has_valid_address()teor
To avoid a bug warning. Fixes 31793. Bug not in any release, no changes file required.
2019-09-19test: dirserv_router_has_valid_address() with zero-family addressesteor
Sometimes tor doesn't initialise an address, so its family is zero. Failing test for 31793. Future commits will fix the code.
2019-09-18Merge branch 'bug30916_035' into bug30916_041Nick Mathewson
2019-09-18Avoid a crash if our "current" and "old" ntor onion keys are equalNick Mathewson
Our dimap code asserts if you try to add the same key twice; this can't happen if everything is running smoothly, but it's possible if you try to start a relay where secret_onion_key_ntor is the same as secret_onion_key_ntor.old. Fixes bug 30916; bugfix on 0.2.4.8-alpha when ntor keys were introduced.
2019-09-18Extract expressions in construct_ntor_key_map()Nick Mathewson
No behavioral change here: this is just refactoring.
2019-09-18Merge branch 'maint-0.4.1'Nick Mathewson
2019-09-18Merge branch 'bug31772_041' into maint-0.4.1Nick Mathewson
2019-09-17Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson
2019-09-17Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-09-17Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5Nick Mathewson
2019-09-17Correct the syntax description for the MAPADDRESS command.Nick Mathewson
In 0.4.1.1-alpha I introduced a bug where we would require and ignore a single positional argument. Fixes bug 31772.
2019-09-17Bump version to 0.4.1.6Nick Mathewson
2019-09-17Merge branch 'bug31570_041' into maint-0.4.1Nick Mathewson
2019-09-17Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson