Nick Mathewson
554b805093
Merge branch 'bug33032_041' into bug33032_042
2020-03-11 10:35:47 -04:00
Nick Mathewson
55055396cc
Merge branch 'maint-0.4.1' into bug33032_041
2020-03-11 10:35:46 -04:00
Nick Mathewson
5721ec22d8
pem_decode(): Tolerate CRLF line endings
...
Fixes bug 33032; bugfix on 0.3.5.1-alpha when we introduced our own
PEM decoder.
2020-03-11 10:35:17 -04:00
teor
ff52205362
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-02-12 12:22:04 +10:00
teor
5298113da9
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-02-12 12:21:57 +10:00
Alexander Færøy
b9c7c61ea5
Lowercase the BridgeDistribution value from torrc in descriptors.
...
This patch ensures that we always lowercase the BridgeDistribution from
torrc in descriptors before submitting it.
See: https://bugs.torproject.org/32753
2020-02-12 12:21:41 +10:00
Nick Mathewson
0c90fc37ec
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-02-10 14:17:10 -05:00
Nick Mathewson
71c49f7356
Merge branch 'maint-0.4.0' into maint-0.4.1
2020-02-10 14:17:10 -05:00
Nick Mathewson
f3fa22bf1b
Merge branch 'maint-0.3.5' into maint-0.4.0
2020-02-10 14:17:09 -05:00
Nick Mathewson
99d044d553
Fix a Rust compilation warning; resolve bug 33212.
2020-02-10 13:32:09 -05:00
Nick Mathewson
49cffee635
bump to 0.4.2.6-dev
2020-01-30 11:19:16 -05:00
Nick Mathewson
7afb95d3e3
Bump to 0.4.1.8-dev
2020-01-30 11:18:50 -05:00
Nick Mathewson
f470b863a0
Bump version to 0.4.2.6
2020-01-29 19:44:29 -05:00
Nick Mathewson
ec7f99e6ef
bump to 0.4.1.8
2020-01-29 19:42:24 -05:00
teor
7b6be02a92
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-01-30 07:55:12 +10:00
teor
6b392c333a
Merge branch 'maint-0.4.0' into maint-0.4.1
2020-01-30 07:55:05 +10:00
teor
65825018c7
Merge branch 'maint-0.3.5' into maint-0.4.0
2020-01-30 07:54:58 +10:00
teor
9b0b2aef80
Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1
2020-01-30 07:54:39 +10:00
teor
41d52e9cd8
Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5
2020-01-30 07:53:53 +10:00
teor
fb541ffca3
Merge branch 'maint-0.4.0' into maint-0.4.1
2020-01-16 10:00:40 +10:00
teor
026f068bb3
Merge branch 'maint-0.3.5' into maint-0.4.0
2020-01-16 10:00:32 +10:00
teor
19954cffd7
Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5
2020-01-16 09:57:27 +10:00
Nick Mathewson
6da989cfe8
Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2
2020-01-06 13:20:57 -05:00
Nick Mathewson
54eec5342d
Initialize publish/subscribe code when running as an NT service.
...
Fixes bug 32778; bugfix on 0.4.1.1-alpha.
2020-01-06 09:22:57 -05:00
Nick Mathewson
16e94dc7a7
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-01-06 08:06:54 -05:00
Peter Gerber
b9d81282e0
Fix sandbox crash during reload of logging configuration
...
Allow calls to dup() which was introduced in commit a22fbab986
.
From a security perspective, I don't think this should impact the
security of the sandbox significantly. As far as I can tell, there
is nothing an adversary can do with a duplicated FD that can't be
done with the original.
2020-01-05 15:24:45 +00:00
Peter Gerber
0d64bafcfe
Correct how we use libseccomp
...
This fixes a startup crash with libseccomp v2.4.0 if Sandbox is
set to 1.
2019-12-17 09:47:28 -05:00
Nick Mathewson
b4977d1aa9
Fix formatting in tor_assertf() message in struct_check_magic().
...
Closes 32771; bugfix on 0.4.2.1-alpha.
2019-12-16 15:31:23 -05:00
Nick Mathewson
df5c81fec0
Merge branch 'bug32765_041' into bug32771_042
2019-12-16 15:27:18 -05:00
Nick Mathewson
1b619a627c
Use CHECK_PRINTF() for printf-like functions in util_bug.h
2019-12-16 15:14:13 -05:00
Nick Mathewson
b7d18f8610
bump to 0.4.2.5-dev
2019-12-09 16:03:31 -05:00
Nick Mathewson
7174a80edd
bump to 0.4.1.7-dev
2019-12-09 16:02:36 -05:00
Nick Mathewson
b9504f788c
Bump version to 0.4.0.6-dev
2019-12-09 16:01:56 -05:00
Nick Mathewson
0c4f0ec977
bump to 0.3.5.9-dev
2019-12-09 16:01:11 -05:00
Nick Mathewson
3248630fc8
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-12-06 16:02:08 -05:00
Nick Mathewson
6513102b9d
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-06 16:02:08 -05:00
Nick Mathewson
c7ca3fc186
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-12-06 16:02:07 -05:00
Nick Mathewson
74cae547e5
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-12-06 16:02:07 -05:00
Karsten Loesing
b7b467d3af
Update geoip and geoip6 to the December 3 2019 database.
2019-12-06 11:50:35 +01:00
Nick Mathewson
0a33522b62
Bump to 0.4.2.5
2019-12-05 13:32:30 -05:00
Nick Mathewson
8933c7908d
bump version to 0.4.1.7
2019-12-05 13:31:46 -05:00
Nick Mathewson
e66533befa
Bump to 0.4.0.6
2019-12-05 13:31:01 -05:00
Nick Mathewson
c53567c36f
Bump version to 0.3.5.9
2019-12-05 13:29:49 -05:00
teor
cfa9cc34aa
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-05 10:14:01 +10:00
teor
92fb099067
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-12-05 10:13:53 +10:00
teor
46057ec5ae
Merge remote-tracking branch 'tor-github/pr/1424' into maint-0.4.0
2019-12-05 10:13:15 +10:00
teor
aee966cb06
Merge remote-tracking branch 'tor-github/pr/1277' into maint-0.3.5
2019-12-05 10:11:18 +10:00
teor
26071aa3be
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-11-25 12:37:07 +10:00
teor
055f5d4d1b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-11-25 12:36:59 +10:00
teor
c17ab20ac0
Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.0
2019-11-25 12:36:41 +10:00