Nick Mathewson
51d94cea33
Merge branch 'maint-0.3.5'
2018-12-01 11:26:55 -05:00
Nick Mathewson
1a97379e5e
Merge remote-tracking branch 'tor-github/pr/554' into maint-0.3.5
2018-12-01 11:26:52 -05:00
Nick Mathewson
7e9985b75a
Merge remote-tracking branch 'tor-github/pr/536'
2018-12-01 11:24:02 -05:00
Nick Mathewson
af9dc12fab
Merge branch 'maint-0.3.5'
2018-12-01 11:20:10 -05:00
rl1987
9bbf7ec303
Add changes file
2018-12-01 11:18:03 -05:00
Nick Mathewson
cf3f7753c3
Merge branch 'maint-0.3.5'
2018-12-01 11:15:09 -05:00
Nick Mathewson
e82023d2f7
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-01 11:15:09 -05:00
Nick Mathewson
e3a19b1c78
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-01 11:15:09 -05:00
Neel Chauhan
d18a167ff3
sr: Switch from tor_assert() to BUG()
...
Closes #19566
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-11-30 12:16:18 -05:00
Nick Mathewson
9c2b114b2e
Merge branch 'maint-0.3.5'
2018-11-27 12:03:50 -05:00
Nick Mathewson
72c1303cef
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-27 12:03:50 -05:00
Alexander Færøy
36c3235534
Explicitly specify path to OpenSSL for Appveyor.
...
This patch explicitly specifies the path to our OpenSSL dependency and
disables the installation of an external OpenSSL version and instead
uses the OpenSSL version available from the MinGW environments.
See: https://bugs.torproject.org/28574
2018-11-27 14:53:50 +01:00
Nick Mathewson
8a15d0f69b
Merge branch 'maint-0.3.5'
2018-11-26 17:25:28 -05:00
Nick Mathewson
feb41b7c30
Merge remote-tracking branch 'teor/bug28096-035-squashed' into maint-0.3.5
2018-11-26 17:24:41 -05:00
Nick Mathewson
fc1ad9ab65
Merge remote-tracking branch 'tor-github/pr/495'
2018-11-26 17:17:40 -05:00
Nick Mathewson
e12fdeb181
Changes file for "Dormant Mode" (28335, 2149).
2018-11-26 16:39:44 -05:00
David Goulet
2b9a907bdc
Merge branch 'maint-0.3.5'
2018-11-26 14:59:24 -05:00
David Goulet
056ffdec4c
Merge remote-tracking branch 'dgoulet/ticket28128_035_01' into maint-0.3.5
2018-11-26 14:59:10 -05:00
teor
657618ba9b
Entry Nodes: Mark outdated dirservers in reasonably live consensuses
...
Fixes bug 28569; bugfix on Tor 0.3.2.5-alpha.
2018-11-22 16:54:34 +10:00
teor
d1ac5613fc
Entry Nodes: Use a reasonably live consensus to select guards
...
Fixes bug 24661; bugfix on 0.3.0.1-alpha.
2018-11-22 16:54:22 +10:00
teor
ffc7b81b5d
Test: Fix memory leaks and missing unmocks in entry guard tests
...
test_entry_guard_outdated_dirserver_exclusion leaks memory, and is
missing some unmocks.
Fixes 28554; bugfix on 0.3.0.1-alpha.
2018-11-22 16:42:32 +10:00
Nick Mathewson
a9820f072b
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-20 13:10:38 -05:00
Nick Mathewson
56f24889a2
Merge branch 'maint-0.3.5'
2018-11-20 13:10:38 -05:00
Nick Mathewson
9da8cd0bc3
Merge remote-tracking branch 'teor/ticket28459-034' into maint-0.3.4
2018-11-20 13:10:18 -05:00
Nick Mathewson
34cadefe34
Merge branch 'maint-0.3.5'
2018-11-20 09:04:35 -05:00
Taylor Yu
0489288aa2
Update control_free_all() for #27169
...
Reset the added bootstrap tracking state introduced by ticket 27169.
Fixes bug 28524; bugfix on 0.3.5.1-alpha.
2018-11-19 15:48:08 -06:00
Nick Mathewson
8183640ada
Merge branch 'maint-0.3.5'
2018-11-19 10:18:57 -05:00
Alexander Færøy
3260914db0
Add missing library to build tor-print-ed-signing-cert.
...
To succesful compile tor-print-ed-signing-cert.exe on Windows we
sometimes need to include the @TOR_LIB_GDI@ library.
See: https://bugs.torproject.org/28485
2018-11-19 10:18:44 -05:00
Nick Mathewson
a8df39e955
Merge remote-tracking branch 'tor-github/pr/519'
2018-11-19 08:47:03 -05:00
Nick Mathewson
26539ec3ae
Merge remote-tracking branch 'tor-github/pr/518'
2018-11-19 08:45:41 -05:00
Nick Mathewson
48b08f0592
Merge branch 'ticket27359_v2_squashed'
2018-11-19 08:26:49 -05:00
Nick Mathewson
426c9561c5
Use nodefamily_t in microdescriptors.
...
Closes ticket 27359.
2018-11-19 08:26:10 -05:00
rl1987
c8c4c3dffa
fixup! Make ROUTERLIST_PRUNING_INTERVAL 1 hr.
2018-11-17 10:27:10 +02:00
Nick Mathewson
35558c39dd
Merge remote-tracking branch 'dgoulet/ticket27471_035_02' into maint-0.3.5
2018-11-16 08:57:56 -05:00
Nick Mathewson
80a6228aac
Merge branch 'bug25573-034-typefix' into maint-0.3.4
2018-11-15 16:58:16 -05:00
Nick Mathewson
15e752e6b1
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-15 16:54:56 -05:00
Nick Mathewson
cbe04d4550
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-11-15 16:54:16 -05:00
Nick Mathewson
63312e0299
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-15 16:47:25 -05:00
Nick Mathewson
aebe8a82c9
Merge branch 'bug26913_033' into maint-0.3.3
2018-11-15 16:47:22 -05:00
Nick Mathewson
8569166c70
Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9
...
Resolved conflicts with the 26269 fix in 015fcd0e11
2018-11-15 16:43:50 -05:00
Nick Mathewson
1e6ffeaeaa
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-15 16:37:41 -05:00
Nick Mathewson
34e4d5a783
Merge remote-tracking branch 'dgoulet/bug27550_033_01' into maint-0.3.3
2018-11-15 16:37:02 -05:00
David Goulet
f41bec1290
man: ClientOnionAuthDir can't be reloaded with Sandbox 1
...
By adding a file to the ClientOnionAuthDir and sending a HUP signal, tor would
load the new file and use it. However, that doesn't work with the Sandbox
since post initilization, nothing can be changed.
Document in the manpage that limitation within the Sandbox description.
Closes #28128
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-11-15 14:36:39 -05:00
rl1987
d9f7cb3f62
Fix shellcheck issues in cov-diff - SC2231, SC2006 and SC2086
2018-11-15 19:37:07 +02:00
rl1987
8cb817cc5e
Add changes file
2018-11-15 19:35:56 +02:00
Nick Mathewson
92f71b8e88
Merge branch 'maint-0.3.5'
2018-11-15 09:06:18 -05:00
Nick Mathewson
a9db07f325
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-15 09:06:18 -05:00
teor
b8ce1de4bf
Appveyor: always show the logs, and upload them as build artifacts
...
Always show the configure and test logs, and upload them as build
artifacts, when building for Windows using Appveyor CI.
Implements 28459.
2018-11-15 21:04:17 +10:00
teor
83c1baca16
Appveyor: manually add zstd flags to configure
...
The mingw zstd from MSYS2 doesn't come with a pkg-config file.
Fixes 28454 on Tor 0.3.4.1-alpha.
2018-11-15 19:23:37 +10:00
teor
540c833f20
Appveyor: remove incorrect OpenSSL path
...
Fixes 28399 on 0.3.4.1-alpha.
2018-11-15 19:23:33 +10:00
