33282 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	17a870a64b	Merge branch 'ticket31240v2_merged_2' into ticket31240v2_merged_2_merged	2019-09-04 08:41:42 -04:00
David Goulet	f5fa283a04	Merge branch 'tor-github/pr/1288'	2019-09-04 08:34:26 -04:00
David Goulet	a816742f37	Merge branch 'maint-0.4.1'	2019-09-04 08:33:28 -04:00
David Goulet	630bb113a0	Merge branch 'tor-github/pr/1271' into maint-0.4.1	2019-09-04 08:33:10 -04:00
David Goulet	6210c75076	Merge branch 'tor-github/pr/1246'	2019-09-04 08:27:36 -04:00
teor	9c798dd5a5	torerr: Fix a comment typo and update the comment for format_number_sigsafe() ... Closes 31612.	2019-09-04 14:06:58 +10:00
teor	193c74faf9	Merge branch 'bug31571_041' into bug31571_master	2019-09-04 13:57:39 +10:00
teor	abe1f4f23e	Merge branch 'bug31571_040' into bug31571_041	2019-09-04 13:57:36 +10:00
teor	0cee6f498c	Merge branch 'bug31571_035' into bug31571_040	2019-09-04 13:57:31 +10:00
teor	a836dd2530	Merge branch 'maint-0.3.5' into bug31571_035	2019-09-04 13:57:15 +10:00
teor	f311d0676c	backtrace: Check the return values of snprintf() and strncpy() ... We can't use strlcat() or strlcpy() in torerr, because they are defined in string/compat_string.h on some platforms, and string uses torerr. Part of 31571.	2019-09-04 13:51:22 +10:00
George Kadianakis	7fa624537c	Merge branch 'tor-github/pr/1269'	2019-09-03 17:11:25 +03:00
Nick Mathewson	a617001fd4	Merge remote-tracking branch 'tor-github/pr/1279'	2019-09-03 09:47:25 -04:00
Nick Mathewson	03040903e6	practracker: handle empty files. ... Previously practracker would fail on a file with no lines.	2019-09-02 15:40:35 -04:00
Nick Mathewson	3a2964577e	practracker: Fix indentation in util.py ... This commit only changes whitespace and removes a temporary comment.	2019-09-02 15:40:35 -04:00
Nick Mathewson	651bbe8a0d	Practracker: only consider files under "src/"	2019-09-02 15:40:35 -04:00
Nick Mathewson	78307ed186	Merge remote-tracking branch 'tor-github/pr/1272'	2019-09-02 14:13:32 -04:00
Nick Mathewson	01bda9bed1	Merge branch 'maint-0.4.1'	2019-09-02 14:11:32 -04:00
Nick Mathewson	e3a458e441	Merge branch 'ticket12399_035' into maint-0.4.1	2019-09-02 14:11:18 -04:00
rl1987	05fa1689eb	Change loglevel of message 'Hash of session info was not as expected'	2019-09-02 14:09:39 -04:00
teor	f538e23986	ChangeLog/ReleaseNotes: fix some incorrect bugfix versions ... Closes 31461.	2019-09-02 13:29:17 -04:00
teor	a3fad4d057	ChangeLog/ReleaseNotes: fix a typo in the 0.4.1 changes entries ... Part of 31461.	2019-09-02 13:29:12 -04:00
Neel Chauhan	d22ed05dc0	Space out the arguments to the cell functions in rend_process_relay_cell()	2019-08-30 18:58:00 -04:00
teor	340698ba10	Merge branch 'maint-0.4.1'	2019-08-30 23:33:18 +10:00
teor	25e7fc5b7a	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-08-30 23:33:10 +10:00
teor	a52a5e0099	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-08-30 23:33:01 +10:00
teor	1132dc9f75	Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5	2019-08-30 23:24:05 +10:00
teor	b66712d85b	Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5	2019-08-30 23:22:18 +10:00
teor	4662cbec7b	Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5	2019-08-30 23:20:59 +10:00
teor	c55591825f	torerr: Try harder to flush raw assert messages before process termination ... Some platforms (macOS, maybe others?) can swallow the last write before an abort. This issue is probably caused by a race condition between write buffer cache flushing, and process termination. So we write an extra newline, to make sure that the message always gets through. Fixes bug 31571; bugfix on 0.3.5.1-alpha.	2019-08-30 21:51:11 +10:00
teor	65a1d86491	torerr: Log the Tor backtrace version when a raw assertion fails ... Part of 31571.	2019-08-30 21:51:07 +10:00
teor	743bc0028b	backtrace: Log the Tor backtrace version whenever we log a backtrace ... Previously, we just logged it in the crash handler. Part of 31571.	2019-08-30 21:51:03 +10:00
teor	e2a7d08aa7	backtrace: Always set a backtrace Tor version ... We want to report the tor version, even on platforms that don't have backtrace support (like Android). This commit stores the backtrace Tor version, regardless of USE_BACKTRACE. Preparation for 31571.	2019-08-30 21:50:57 +10:00
David Goulet	88a8deb420	Merge branch 'tor-github/pr/1236'	2019-08-29 12:58:25 -04:00
Nick Mathewson	e3f7e5e65e	practracker: make filename terminology uniform ... Previously we often referred to "C files" and "H files", which is more ambiguous than ".c files" and ".h files".	2019-08-29 09:20:27 -04:00
Nick Mathewson	c281fa0da2	Describe clear_cfg_fn_t better.	2019-08-29 09:14:51 -04:00
teor	e155598fe3	scripts/git: fix shellcheck issues in git-push-all.sh ... Part of 31314.	2019-08-29 23:13:29 +10:00
teor	340ff7f5f8	scripts/git: fix an env var typo in git-merge-forward.sh ... Part of 31314.	2019-08-29 22:58:53 +10:00
David Goulet	960d989415	Merge branch 'tor-github/pr/1257'	2019-08-29 08:56:04 -04:00
David Goulet	7c99a4ddde	Merge branch 'maint-0.4.1'	2019-08-29 08:55:58 -04:00
David Goulet	ff905f8e1e	Merge branch 'tor-github/pr/1256' into maint-0.4.1	2019-08-29 08:55:31 -04:00
David Goulet	337b733cfc	Merge branch 'tor-github/pr/1255' into maint-0.4.1	2019-08-29 08:55:27 -04:00
teor	d0e31b4d1f	scripts/git: Quote shell arguments where possible ... Most shell arguments should be quoted to avoid mistakes. But since all branch names are hard-coded, or supplied by the script user, we don't need to be too concerned about command injection. Quoting all shell arguments would take a major refactor. (Probably using arrays.) Part of 31314.	2019-08-29 22:53:44 +10:00
teor	664e6a392e	scripts/git: Improve usage documentation for merge-forward and push-all ... Part of 31314.	2019-08-29 22:52:21 +10:00
teor	b47b71ad2f	scripts/git: Let git-push-all.sh skip unchanged test branches ... Skip test branches that are the same as remote maint/release/master branches. Add a TOR_PUSH_SAME and -s argument to git-push-all.sh to change this default. Part of 31314.	2019-08-29 22:50:47 +10:00
teor	70387054b9	scripts/git: Make the git push command and args configurable ... TOR_GIT_PUSH provides the git push command and default arguments. Also fix handling of git-push-all.sh script arguments and arguments that are passed through to $TOR_GIT_PUSH, using a "--" argument as a separator. Fix on 29879.	2019-08-29 22:50:37 +10:00
teor	15782758c7	scripts/git: Allow git-merge-forward.sh to re-use existing test branches ... Add a -u argument to git-merge-forward.sh, so that the script can re-use existing test branches after a merge failure and fix. Part of 31314.	2019-08-29 22:47:50 +10:00
teor	667311ebbd	scripts/git: Add test branch support to the git scripts ... Add a -t <test-branch-prefix> argument to git-merge-forward.sh and git-push-all.sh, which makes these scripts create, merge forward, and push test branches. Add a -r <remote-name> argument to git-push-all.sh, so the script can push test branches to a personal remote. Closes ticket 31314.	2019-08-29 22:47:43 +10:00
teor	c98724b022	scripts/git: Cleanup and fix minor git scripts issues ... Fix typos, clean up formatting, rewrite some comments, add headings. Preparation for 31314.	2019-08-29 22:42:37 +10:00
teor	664d1b4366	test: Change "make test-stem" so it only runs the stem tests that use tor ... This change makes test-stem faster and more reliable. Use "make test-stem-full" to run all of stem's tests. Closes ticket 31554.	2019-08-29 21:56:16 +10:00