Isis Lovecruft
bb4993395c
doc: Document how to build with Rust dependencies in offline-mode.
...
* CLOSES #22907 : https://bugs.torproject.org/22907
2017-11-28 22:39:55 +00:00
Nick Mathewson
b230860608
Merge branch 'maint-0.3.2'
2017-11-27 10:04:16 -05:00
Nick Mathewson
ef54610442
Merge branch 'ticket23856_025_01' into maint-0.3.2
2017-11-27 10:02:03 -05:00
David Goulet
8be50ca3ea
relay: Change bandwidth stats interval to 24 hours
...
Going from 4 hours to 24 hours in order to try reduce the efficiency of guard
discovery attacks.
Closes #23856
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-27 10:00:40 -05:00
Nick Mathewson
722c64fc23
Merge branch 'maint-0.3.2'
2017-11-27 09:09:34 -05:00
Nick Mathewson
4bb287aa39
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-27 09:09:34 -05:00
Nick Mathewson
703ab95e9f
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-27 09:09:34 -05:00
Nick Mathewson
b1c4ab0bec
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-27 09:09:34 -05:00
Nick Mathewson
30b3229252
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-27 09:09:34 -05:00
Sebastian Hahn
25c90230be
Add bastet's ipv6 address
...
Implements ticket 24394
2017-11-27 09:09:16 -05:00
Nick Mathewson
5da0a73838
Merge branch 'ticket23953_033_squashed'
2017-11-21 14:06:57 -05:00
Nick Mathewson
25f882a9cf
Use stdatomic.h for atomic_counter_t where available.
...
Closes ticket 23953.
2017-11-21 14:06:48 -05:00
Nick Mathewson
1cc344b277
Merge remote-tracking branch 'teor/bug23760_nc'
2017-11-21 13:56:57 -05:00
Nick Mathewson
add37440fa
changes file for 24318
2017-11-21 13:55:11 -05:00
Fernando Fernandez Mancera
edc3fe0eb5
Remove /usr/athena from search path in configure.ac
...
Fixes #24363
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
2017-11-21 13:53:26 -05:00
Nick Mathewson
517032b8ce
Merge branch 'maint-0.3.2'
2017-11-21 12:41:39 -05:00
Nick Mathewson
ba94dc28e8
Merge branches 'bug24099_031' and 'bug24086_031' into maint-0.3.2
2017-11-21 12:37:46 -05:00
Neel Chauhan
83b8034a98
Introduce node_get_curve25519_onion_key() in extend_info_from_node()
2017-11-22 02:20:54 +11:00
Nick Mathewson
9068e55ce8
Merge branch 'maint-0.3.2'
2017-11-20 14:25:17 -05:00
Nick Mathewson
1bf36c1837
Include ws2_32 when trying to link openssl on windows in autoconf
...
Fixes bug 23783; bugfix on 0.3.2.2-alpha when we started looking for
TLSv1_1_method().
2017-11-20 13:37:22 -05:00
Nick Mathewson
729f9a286c
Merge branch 'maint-0.3.2'
2017-11-20 13:22:10 -05:00
Nick Mathewson
846df5b3cd
Merge remote-tracking branches 'public/ticket24315_029' and 'public/bug24198_029' into maint-0.3.2
2017-11-20 13:20:25 -05:00
Nick Mathewson
3bb29dd707
Correctly handle partial success in consensus diff calculation.
...
Previously, if store_multiple() reported a partial success, we would
store all the handles it gave us as if they had succeeded. But it's
possible for the diff to be only partially successful -- for
example, if LZMA failed but the other compressors succeeded.
Fixes bug 24086; bugfix on 0.3.1.1-alpha.
2017-11-20 11:04:37 -05:00
Nick Mathewson
c8ee12b2e8
Recover better from empty/invalid storagedir files
...
If we can't read a file because of an FS issue, we say "we can't
read that" and move on. But if we can't read it because it's empty,
because it has no labels, or because its labels are misformatted, we
should remove it.
Fixes bug 24099; bugfix on 0.3.1.1-alpha.
2017-11-20 10:14:41 -05:00
Nick Mathewson
04812e59df
Merge branch 'maint-0.3.2'
2017-11-20 08:39:39 -05:00
Nick Mathewson
e0f7a2dbd4
Merge branch 'bug23681_029_01_squashed' into maint-0.3.2
2017-11-20 08:39:34 -05:00
David Goulet
981bb60575
circuit: Don't timeout opened C_INTRODUCING circuit
...
A circuit with purpose C_INTRODUCING means that its state is opened but the
INTRODUCE1 cell hasn't been sent yet. We shouldn't consider that circuit when
looking for timing out "building circuit". We have to wait on the rendezvous
circuit to be opened before sending that cell so the intro circuit needs to be
kept alive for at least that period of time.
This patch makes that the purpose C_INTRODUCING is ignored in the
circuit_expire_building() which means that we let the circuit idle timeout
take care of it if we end up never using it.
Fixes #23681
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-20 08:33:44 -05:00
Nick Mathewson
2e590bac97
Remove changes files that have already been merged in 0.3.2.x
2017-11-18 11:23:41 -05:00
Nick Mathewson
7358559524
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-18 11:02:42 -05:00
Nick Mathewson
2d849716df
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-18 11:02:08 -05:00
Nick Mathewson
53c3174ee4
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-18 11:01:43 -05:00
Nick Mathewson
d388f9d879
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-18 11:01:33 -05:00
Nick Mathewson
b9bce4288e
Merge branch 'maint-0.3.2'
2017-11-18 10:23:52 -05:00
Nick Mathewson
a5b8b55c1c
Fix memory leak in unit test for bridge distribution config.
...
Also, check for the actual message, and fix some string confusion,
while we're at it.
Fixes bug 24345; bugfix on 0.3.2.3-alpha.
2017-11-18 10:22:14 -05:00
Nick Mathewson
fcdec00685
Merge branch 'maint-0.3.2'
2017-11-17 09:59:26 -05:00
Nick Mathewson
2cee26b164
Merge branch 'bug23817_031' into maint-0.3.2
2017-11-17 09:56:53 -05:00
George Kadianakis
f61e3090fb
Introduce new guard restriction and use it to skip outdated dirs.
2017-11-17 09:52:40 -05:00
Nick Mathewson
94dce246ee
Merge branch 'maint-0.3.2'
2017-11-17 09:26:11 -05:00
Matt Traudt
b98614f1af
Only log about lost KIST support once
2017-11-17 09:25:47 -05:00
Matt Traudt
8b2c01a46f
Use less jargon in Scheduler sec. of man page
2017-11-17 09:25:07 -05:00
Matt Traudt
3537f7801d
Add notes about OS support for our scheduler types
2017-11-17 09:25:01 -05:00
Nick Mathewson
cfacd44240
Merge branch 'maint-0.3.2'
2017-11-17 09:23:07 -05:00
Nick Mathewson
85778dc92d
Merge remote-tracking branch 'dgoulet/bug23861_032_01' into maint-0.3.2
2017-11-17 09:23:04 -05:00
Nick Mathewson
368dc1003e
Merge branch 'maint-0.3.2'
2017-11-17 08:35:56 -05:00
Nick Mathewson
3a364309ac
Merge branch 'bug24167_025' into maint-0.3.2
2017-11-17 08:35:52 -05:00
Nick Mathewson
4ef70ff389
Merge branch 'maint-0.3.2'
2017-11-17 08:35:04 -05:00
Nick Mathewson
0571015819
Merge branch 'ticket24097_032' into maint-0.3.2
2017-11-17 08:35:01 -05:00
Nick Mathewson
4b56df9874
Merge branch 'maint-0.3.2'
2017-11-17 08:34:23 -05:00
Nick Mathewson
0684e6c6f0
Merge branch 'bug20963_032' into maint-0.3.2
2017-11-17 08:34:05 -05:00
Nick Mathewson
80bf270404
Add a changes file.
2017-11-16 14:07:58 -05:00