Nick Mathewson
aec359ef62
Merge branch 'maint-0.4.1'
2019-06-24 13:36:42 -04:00
Nick Mathewson
bd66a40845
Merge remote-tracking branch 'tor-github/pr/1131'
2019-06-24 13:36:36 -04:00
Nick Mathewson
8803930de8
Merge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1
2019-06-24 13:36:10 -04:00
Nick Mathewson
3b6bd768d3
Merge branch 'maint-0.4.1'
...
"ours" to avoid version bump.
2019-06-24 09:32:54 -04:00
Nick Mathewson
aab5f42ae0
bump to 0.4.1.3-alpha
2019-06-24 09:32:46 -04:00
teor
45be44ed9c
stats: Split extrainfo_dump_to_string() into smaller functions.
...
Closes ticket 30956.
2019-06-24 20:47:44 +10:00
teor
872b85e689
Merge branch 'bug30956_041' into bug30956_master
2019-06-24 19:47:34 +10:00
teor
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
Nick Mathewson
70415c9f72
Merge branch 'maint-0.4.1'
...
"ours" merge to avoid taking pracktracker removal.
2019-06-19 14:29:22 -04:00
Nick Mathewson
4ecd09cfb7
remove practracker from check-local (0.4.1 only)
2019-06-19 14:29:08 -04:00
David Goulet
91c7d395cf
changes: Fix typo in changes/ticket30893
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-19 07:50:02 -04:00
David Goulet
e6579d801f
Merge branch 'tor-github/pr/1113'
2019-06-19 07:47:03 -04:00
Nick Mathewson
125a6300da
Merge remote-tracking branch 'tor-github/pr/1115'
2019-06-18 09:10:34 -04:00
Nick Mathewson
93ca08d66c
Merge branch 'ticket29533_squashed'
2019-06-17 08:56:13 -04:00
rl1987
86478be50f
Add changes file
2019-06-17 08:56:06 -04:00
rl1987
e8da65ee91
Fix SC2034 in pre-push.git-hook
2019-06-17 08:56:06 -04:00
rl1987
19dbd431c5
Shellcheck all the scripts
2019-06-17 08:56:02 -04:00
Nick Mathewson
52d386c9b0
Merge remote-tracking branch 'tor-github/pr/1100'
2019-06-17 08:54:12 -04:00
rl1987
66a15013fa
Allow excluding documentation from the build
2019-06-16 20:21:30 +03:00
Nick Mathewson
7c6cc470f1
Merge branch 'bug30894_035' into ticket30893
2019-06-15 16:50:02 -04:00
Nick Mathewson
4613159c61
Changes file for ticket 30893 (confparse testing)
2019-06-15 16:49:18 -04:00
Nick Mathewson
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
Nick Mathewson
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
Nick Mathewson
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
Nick Mathewson
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
George Kadianakis
319ce22581
Merge branch 'bug30806'
2019-06-14 13:28:32 +03:00
Nick Mathewson
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
teor
16e71c7fb0
practracker: accept an extra line in nt_service_install()
...
Part of 30799.
2019-06-13 18:23:50 +10:00
George Kadianakis
438b7eec85
Merge branch 'tor-github/pr/1099'
2019-06-12 13:02:49 +03:00
George Kadianakis
96fade0a7d
Merge branch 'tor-github/pr/1088'
2019-06-12 13:01:53 +03:00
George Kadianakis
7b3efc386f
Merge branch 'tor-github/pr/1102'
2019-06-12 13:00:20 +03:00
David Goulet
f7e8b3b68c
Merge branch 'tor-github/pr/1040'
2019-06-11 11:59:39 -04:00
Taylor Yu
5f5f6bb8fb
Add changes file for 29976
2019-06-11 11:59:30 -04:00
Taylor Yu
0bce0c339d
Rework origin circuit tracking to use pubsub
...
Part of ticket 29976.
2019-06-11 11:59:30 -04:00
Taylor Yu
a8c0f4ddfe
Rework orconn tracking to use pubsub
...
Part of ticket 29976.
2019-06-11 11:59:30 -04:00
David Goulet
8e112cecd8
Merge branch 'tor-github/pr/1031'
2019-06-11 11:46:38 -04:00
David Goulet
e9d99d2e15
Merge branch 'tor-github/pr/1083'
2019-06-11 11:43:15 -04:00
David Goulet
35dd2d733b
Merge branch 'maint-0.4.1'
2019-06-11 11:30:05 -04:00
David Goulet
ea14fb136c
Merge branch 'tor-github/pr/1050' into maint-0.4.1
2019-06-11 11:29:46 -04:00
Nick Mathewson
5068ccab0b
Add a changes file for ticket 30686.
2019-06-11 11:29:23 -04:00
Nick Mathewson
cad0de35bd
Give a compile warning when we don't have any flags for minherit().
...
Part of ticket 30686.
2019-06-11 11:29:23 -04:00
Nick Mathewson
93ddc51cbd
Give a more useful failure messgae when we fail to minherit().
...
Part of ticket 30686.
2019-06-11 11:29:23 -04:00
Nick Mathewson
4313f1cce8
Merge branch 'ticket28453_v2' into ticket28453_v2_merged
2019-06-11 10:22:37 -04:00
Nick Mathewson
3405a311da
Merge branch 'maint-0.4.1'
2019-06-11 10:17:18 -04:00
Nick Mathewson
ce89fe36c8
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-11 10:17:18 -04:00
Nick Mathewson
afa2c39baa
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-06-11 10:17:18 -04:00
Nick Mathewson
b0fa1f4fb0
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-06-11 10:17:17 -04:00
Karsten Loesing
0ec4ebd00d
Update geoip and geoip6 to the June 10 2019 database.
2019-06-11 16:12:50 +02:00
Nick Mathewson
eb02c323eb
Merge branch 'maint-0.4.1'
2019-06-11 08:41:55 -04:00
Nick Mathewson
29842f68e7
Merge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1
2019-06-11 08:41:48 -04:00
