d819dfbded
Merge branch 'tor-github/pr/1239'
2019-08-26 14:35:27 -04:00
859514d477
Merge branch 'tor-github/pr/1263'
2019-08-26 17:35:34 +03:00
eff95429fd
Merge remote-tracking branch 'tor-github/pr/1241'
2019-08-26 10:15:25 -04:00
ca667b9a8a
Fix/suppress shellcheck warnings in git-push-all.sh
...
(I've chosen to suppress some instances rather than 'fix' them,
since the fix would require arrays or major refactoring.)
Fixes bug 31519; bug not in any released Tor.
2019-08-26 09:58:38 -04:00
24bc2cd7b5
Merge branch 'tor-github/pr/1254'
2019-08-26 09:38:24 -04:00
38c4e1426c
changes file for ticket30935
2019-08-26 09:33:29 -04:00
cde662e259
clarify usage of __ and ___ prefixes on config options
2019-08-24 17:46:08 -04:00
078ba326a1
Make a function for NODUMP.
2019-08-24 17:40:48 -04:00
eb54fe8f97
Make config_var_is_invisible a function.
2019-08-24 17:32:46 -04:00
65511a45ad
Fix comment: ___ options are now that way because of the INVISIBLE flag.
2019-08-24 17:26:02 -04:00
03247c8eaa
whitespace fix
2019-08-24 17:11:41 -04:00
6ba05eea8e
Merge remote-tracking branch 'tor-github/pr/1247'
2019-08-24 16:32:50 -04:00
7a45c9c1d2
Merge remote-tracking branch 'tor-github/pr/1215'
2019-08-24 16:30:55 -04:00
f1707f7db3
Merge branch 'maint-0.4.1'
2019-08-24 16:29:23 -04:00
2780cbb9cb
Merge branch 'ticket30935' into ticket30935_merged
2019-08-22 17:25:35 -04:00
d475d7c2fb
Merge branch 'tor-github/pr/1244'
2019-08-22 17:10:22 -04:00
7c92f4faa2
Merge branch 'bug31463_040' into bug31463_041
2019-08-22 22:10:06 +10:00
8b32d22a07
Merge branch 'bug31463_035' into bug31463_040
2019-08-22 22:10:00 +10:00
190386f1c4
Fix gcc build exclude on travis
...
The main build doesn't use HARDENING_OPTIONS, so the exclude shouldn't,
either. Reduces the number of builders by one.
2019-08-22 22:09:32 +10:00
3bf90e704c
doc(hacking): update = to # on sections
2019-08-21 16:22:37 +02:00
0d6c8eed49
doc(hacking): enhance markdown style
2019-08-21 16:22:08 +02:00
cc48eff2d3
Merge branch 'ticket31176' into ticket31176_merged
2019-08-21 09:46:20 -04:00
edf5a327c5
Merge branch 'ticket30914' into ticket30914_merged
2019-08-20 13:57:05 -04:00
4b1e0dd5b5
remove changes files already contained in 0.4.1.5
2019-08-20 11:16:45 -04:00
6b180703a2
Merge branch 'maint-0.4.1'
...
"ours" to avoid 0.4.1 bump.
2019-08-20 11:15:57 -04:00
3b2a732073
bump to 0.4.1.5-dev
2019-08-20 11:15:45 -04:00
d0b62fff05
forward-port the changelog and release notes for 0.4.1.5
2019-08-20 11:15:17 -04:00
bdcccb9776
scripts/git: Remove a duplicate practracker call from the pre-push hook
...
The pre-push hook already calls the pre-commit hook, which calls
practracker.
Also update the script comments to avoid similar issues in future.
Fixes bug 31462; bugfix on 0.4.1.1-alpha.
2019-08-20 12:21:02 +10:00
0bf980705e
Fix a memory-leak warning in test_circuitbuid.c
...
Coverity wants us to free everything that we are potentially
allocating, even stuff where allocating it would be a bug. Adding
a smartlist_free() here will fix the warning.
Fixes bug 31452; bugfix on 16a0b7ed67
2019-08-19 16:21:55 -04:00
36a27fa2d3
Merge branch 'maint-0.4.1'
...
"ours" to avoid version bump.
2019-08-19 11:36:55 -04:00
ab92881d9a
Update version to 0.4.1.5
2019-08-19 11:35:48 -04:00
e5812c91d6
Merge remote-tracking branch 'tor-github/pr/1231'
2019-08-19 11:34:27 -04:00
29bd43ab03
Merge remote-tracking branch 'tor-github/pr/1224'
2019-08-19 11:26:58 -04:00
b51a822a80
Merge remote-tracking branch 'tor-github/pr/1160'
2019-08-19 11:25:45 -04:00
78d2559d85
Merge branch 'maint-0.4.1'
2019-08-19 11:11:39 -04:00
6a89b01049
Merge remote-tracking branch 'tor-github/pr/1230' into maint-0.4.1
2019-08-19 11:11:32 -04:00
e7aabfce61
Merge remote-tracking branch 'tor-github/pr/1235'
2019-08-19 11:10:21 -04:00
deccd3aa6a
Merge remote-tracking branch 'tor-github/pr/1225'
2019-08-19 11:08:44 -04:00
60adebc499
Merge branch 'tor-github/pr/1217'
2019-08-19 18:07:48 +03:00
4185ef29fd
Merge branch 'tor-github/pr/1122'
2019-08-19 18:06:05 +03:00
af7cf7d5c1
Merge branch 'tor-github/pr/1233'
2019-08-19 18:05:22 +03:00
dfc8c0b536
Merge branch 'tor-github/pr/1214'
2019-08-19 18:04:35 +03:00
19e19c1fa8
Merge branch 'tor-github/pr/1154'
2019-08-19 18:03:51 +03:00
e411fcabd7
Merge branch 'tor-github/pr/1220'
2019-08-19 18:02:44 +03:00
b257e8e553
Merge remote-tracking branch 'mike/bug31356+logs-rebased2' into bug31356_final
2019-08-19 17:53:00 +03:00
c214402a56
Merge branch 'maint-0.4.1'
2019-08-19 10:37:22 -04:00
90f4ed2335
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-19 10:37:21 -04:00
5653b93a1d
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-08-19 10:37:21 -04:00
bba64c9882
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-19 10:37:21 -04:00
a8e6eab379
Merge branch 'tor-github/pr/1213'
2019-08-19 09:49:33 -04:00
David Goulet
George Kadianakis
Nick Mathewson
teor
Sebastian Hahn
Antoine Veuiller