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
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
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
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
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
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
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
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
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
George Kadianakis
a7986755ee
Merge branch 'tor-github/pr/1060'
2019-06-11 14:12:22 +03:00
George Kadianakis
e5ad6fb092
Merge branch 'ticket30769_041_01'
2019-06-11 14:11:24 +03:00
David Goulet
c1359b32a4
trunnel: Rename sendme.trunnel to sendme_cell.trunnel
...
This is to avoid having two sendme.{c|h} in the repository since the subsystem
is implemented in src/core/or/sendme.{c|h}.
Fixes #30769
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-11 14:11:10 +03:00
George Kadianakis
646f7a9a94
Merge branch 'ticket30687_042_01'
2019-06-11 14:02:33 +03:00
David Goulet
7cf9d54e6d
token-bucket: Implement a single counter object
...
Closes #30687 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-11 14:02:22 +03:00
George Kadianakis
b83dba7cb0
Merge branch 'maint-0.4.1'
2019-06-11 13:48:16 +03:00
George Kadianakis
eab9dc06af
Merge branch 'tor-github/pr/1065' into maint-0.4.1
2019-06-11 13:48:10 +03:00
teor
bff42c86cd
changes: file for 30799
...
Note that this memory leak is in unreachable code.
2019-06-11 15:15:19 +10:00
teor
dcb8cad4e6
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5
2019-06-11 14:51:46 +10:00
teor
a742a80eea
Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5
2019-06-11 14:51:37 +10:00
teor
202ccc3930
Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5
2019-06-11 14:48:52 +10:00
teor
a58c4cc6dd
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5
2019-06-11 14:47:40 +10:00
teor
cb20054ccd
Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5
2019-06-11 14:46:24 +10:00
teor
396134188f
Stop hard-coding env vars in the git scripts
...
Set the env vars:
* TOR_MASTER_NAME to override the tor master branch name, and
* TOR_WKT_NAME to override the worktree path
Fixes bug 30841; bugfix on 0.4.0.1-alpha.
2019-06-11 14:34:44 +10:00
teor
973800b847
scripts/git: Stop hard-coding the bash path in the git scripts
...
Some OSes don't have bash in /usr/bin, others have an ancient bash at
this path.
Fixes bug 30840; bugfix on 0.4.0.1-alpha.
2019-06-11 14:29:10 +10:00
Nick Mathewson
cfa943f140
Merge branch 'maint-0.4.1'
2019-06-10 18:44:31 -04:00
Nick Mathewson
5b07ff4011
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-10 18:44:31 -04:00
Nick Mathewson
c8447f95ec
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0
2019-06-10 18:44:20 -04:00
Nick Mathewson
d6b411a351
Merge branch 'maint-0.4.1'
2019-06-10 18:33:26 -04:00
