72ef4f43d5
Merge branch 'tor-github/pr/1142'
2019-06-26 10:57:24 +03:00
7edd01a29b
Merge branch 'tor-github/pr/1109'
2019-06-26 10:56:08 +03:00
a57296da31
Merge branch 'tor-github/pr/1139'
2019-06-26 10:55:05 +03:00
fede64822d
Merge branch 'tor-github/pr/1128'
2019-06-26 10:53:34 +03:00
b2ef076e1a
Merge branch 'maint-0.4.1'
2019-06-26 10:51:50 +03:00
00acccac64
Merge branch 'tor-github/pr/1114' into maint-0.4.1
2019-06-26 10:51:12 +03:00
5612eccef8
Changes file for ticket 30889
2019-06-25 11:42:41 -05:00
5faf54970d
Fix some onion helpers
...
Fix add_onion_helper_clientauth() and add_onion_helper_keyarg() to
explicitly call the appropriate control reply abstractions instead of
allocating a string to pass to their callers.
Part of ticket 30889.
2019-06-25 11:42:34 -05:00
e5e6953be7
Make control_write_reply() mockable
...
Part of ticket 30889.
2019-06-25 11:40:44 -05:00
0dd59fdb56
Clean up some uses of low-level control replies
...
Part of ticket 30889.
2019-06-25 11:39:59 -05:00
3644f4ab5f
Remove changes files that appeared in 0.4.1.3-alpha or earlier.
2019-06-25 11:57:08 -04:00
3a9b41895f
Merge branch 'maint-0.4.1'
...
"ours" to avoid version bump.
2019-06-25 11:56:22 -04:00
fe41504309
forward-port the 0.4.1.3-alpha changelog
2019-06-25 11:56:08 -04:00
e4f66bf7ff
bump to 0.4.1.3-alpha-dev
2019-06-25 11:55:53 -04:00
a87700633c
Don't try to shellcheck src/rust/registry
...
Fixes bug 30963; bug not in any released Tor.
2019-06-24 13:45:05 -04:00
aec359ef62
Merge branch 'maint-0.4.1'
2019-06-24 13:36:42 -04:00
bd66a40845
Merge remote-tracking branch 'tor-github/pr/1131'
2019-06-24 13:36:36 -04:00
8803930de8
Merge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1
2019-06-24 13:36:10 -04:00
3b6bd768d3
Merge branch 'maint-0.4.1'
...
"ours" to avoid version bump.
2019-06-24 09:32:54 -04:00
aab5f42ae0
bump to 0.4.1.3-alpha
2019-06-24 09:32:46 -04:00
45be44ed9c
stats: Split extrainfo_dump_to_string() into smaller functions.
...
Closes ticket 30956.
2019-06-24 20:47:44 +10:00
872b85e689
Merge branch 'bug30956_041' into bug30956_master
2019-06-24 19:47:34 +10:00
8356cc5b51
stats: Always publish pluggable transports in extra info documents
...
Always publish bridge pluggable transport information in the extra info
descriptor, even if ExtraInfoStatistics is 0. This information is
needed by BridgeDB.
Fixes bug 30956; bugfix on 0.4.1.1-alpha.
2019-06-24 19:44:24 +10:00
a52e00b5b3
Fix shellcheck warning SC2034 in test_rebind.sh.
...
Bugfix on be0a4be276
2019-06-23 14:00:43 +03:00
70415c9f72
Merge branch 'maint-0.4.1'
...
"ours" merge to avoid taking pracktracker removal.
2019-06-19 14:29:22 -04:00
4ecd09cfb7
remove practracker from check-local (0.4.1 only)
2019-06-19 14:29:08 -04:00
91c7d395cf
changes: Fix typo in changes/ticket30893
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-06-19 07:50:02 -04:00
e6579d801f
Merge branch 'tor-github/pr/1113'
2019-06-19 07:47:03 -04:00
125a6300da
Merge remote-tracking branch 'tor-github/pr/1115'
2019-06-18 09:10:34 -04:00
93ca08d66c
Merge branch 'ticket29533_squashed'
2019-06-17 08:56:13 -04:00
86478be50f
Add changes file
2019-06-17 08:56:06 -04:00
e8da65ee91
Fix SC2034 in pre-push.git-hook
2019-06-17 08:56:06 -04:00
19dbd431c5
Shellcheck all the scripts
2019-06-17 08:56:02 -04:00
52d386c9b0
Merge remote-tracking branch 'tor-github/pr/1100'
2019-06-17 08:54:12 -04:00
66a15013fa
Allow excluding documentation from the build
2019-06-16 20:21:30 +03:00
7c6cc470f1
Merge branch 'bug30894_035' into ticket30893
2019-06-15 16:50:02 -04:00
4613159c61
Changes file for ticket 30893 (confparse testing)
2019-06-15 16:49:18 -04:00
26436fb1b6
Add more unit tests for confparse.c, so we can refactor.
...
This set of tests gets the line coverage to 100%.
2019-06-15 16:49:18 -04:00
4ab1d1c0c4
Fix memleak when failing to parse a CSV_INTERVAL.
...
Fixes bug 30894; bugfix on 0.3.4.1-alpha
2019-06-15 16:47:16 -04:00
fe9d15cf4b
Remove the PORT configuration type: nothing uses it.
...
All of our port configurations now use an extended format.
2019-06-15 11:30:24 -04:00
ac5e44d9ce
Renaming: CONFIG_TYPE_UINT -> CONFIG_TYPE_POSINT
...
This name has been a historical source of confusion, since "uint"
usually suggests "unsigned int" to people, when the real type is
"nonnegative int".
2019-06-15 11:28:19 -04:00
319ce22581
Merge branch 'bug30806'
2019-06-14 13:28:32 +03:00
990b434c4f
Make evloop into a subsystem.
...
Note that the event base object is _not_ created from the initialize
function, since it is configuration-dependent. This will wait until
configuration is integrated into subsystems.
Closes ticket 30806.
2019-06-14 13:28:10 +03:00
6b136c18e1
Merge branch 'bug30455_041' into bug30455_master
2019-06-14 11:49:02 +10:00
e218da1722
make: Improve the documentation for test-network-all
...
"make test-network-all" shows the warnings from each test-network.sh
run on the console, so developers see new warnings early.
Improve the documentation for this feature, and rename a Makefile
variable so the code is self-documenting.
Fixes bug 30455; bugfix on 0.3.0.4-rc.
2019-06-14 11:44:26 +10:00
16e71c7fb0
practracker: accept an extra line in nt_service_install()
...
Part of 30799.
2019-06-13 18:23:50 +10:00
438b7eec85
Merge branch 'tor-github/pr/1099'
2019-06-12 13:02:49 +03:00
96fade0a7d
Merge branch 'tor-github/pr/1088'
2019-06-12 13:01:53 +03:00
7b3efc386f
Merge branch 'tor-github/pr/1102'
2019-06-12 13:00:20 +03:00
f7e8b3b68c
Merge branch 'tor-github/pr/1040'
2019-06-11 11:59:39 -04:00
George Kadianakis
Taylor Yu
Nick Mathewson
teor
rl1987
David Goulet