372aef8981
Merge remote-tracking branch 'public/bug15546'
2015-04-23 09:50:29 -04:00
af83a205b0
Merge remote-tracking branch 'andrea/ticket14840'
2015-04-23 09:34:00 -04:00
d48df89d19
changes file for 14845
2015-04-23 09:27:59 -04:00
01d988d72f
Merge remote-tracking branch 'teor/bug-15642-v3-fallback-unit-tests'
2015-04-23 09:22:16 -04:00
647b7d37c2
Merge remote-tracking branch 'public/bug15745_027_03'
2015-04-23 09:10:35 -04:00
3acee61422
Merge branch 'feature15652_squashed'
2015-04-23 09:09:33 -04:00
196499da73
Use a custom Base64 encoder with more control over the output format.
2015-04-23 09:06:58 -04:00
8a951ed158
Merge remote-tracking branch 'teor/bug-15771-reachability'
2015-04-23 09:04:53 -04:00
d68bbb0a29
Unit tests for consider_adding_dir_servers() as modified in #15642
...
Unit tests for the 10 valid combinations of set/NULL config options
DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority,
and FallbackDir.
Add assertion in consider_adding_dir_servers() for checks in
validate_dir_servers():
"You cannot set both DirAuthority and Alternate*Authority."
2015-04-23 00:16:04 +10:00
027f73f70e
Disable default fallback directories when other directories are set
...
Only add the default fallback directories when the DirAuthorities,
AlternateDirAuthority, and FallbackDir directory config options
are set to their defaults.
The default fallback directory list is currently empty, this fix will
only change tor's behaviour when it has default fallback directories.
Fixes bug 15642; bugfix on 90f6071d8d
2015-04-23 00:16:04 +10:00
9139aeadb8
Reachability should check ExtendAllowPrivateAddresses not TestingTorNetwork
...
When self-testing reachability, use ExtendAllowPrivateAddresses
to determine if local/private addresses imply reachability.
The previous fix used TestingTorNetwork, which implies
ExtendAllowPrivateAddresses, but this excluded rare configs where
ExtendAllowPrivateAddresses is set but TestingTorNetwork is not.
Fixes bug 15771; bugfix on 0.2.6.1-alpha, bug #13924 .
Patch by "teor", issue discovered by CJ Ess.
2015-04-22 23:54:21 +10:00
9a9ab455a3
Use correct severity in the get_if_addrs tests.
2015-04-21 16:42:07 +00:00
6f6881c432
Use a random count of INTRODUCE2 for IP rotation
...
An introduction point is currently rotated when the amount of INTRODUCE2
cells reached a fixed value of 16384. This makes it pretty easy for an
attacker to inflate that number and observe when the IP rotates which leaks
the popularity of the HS (amount of client that passed through the IP).
This commit makes it a random count between the current value of 16384 and
two times that.
Fixes #15745
Signed-off-by: David Goulet <dgoulet@ev0ke.net >
2015-04-20 17:38:31 -04:00
6c8a186c03
Changes file for ticket 14840
2015-04-17 22:41:50 +00:00
f152081de1
Merge remote-tracking branch 'arma/ticket8766'
2015-04-16 11:15:29 -04:00
b98cc79477
Merge remote-tracking branch 'sebastian/bug14784'
2015-04-15 11:10:37 -04:00
d59c4063f3
Stop modifying const argument in handle_control_postdescriptor
...
Fixes 15546.
2015-04-15 10:47:50 -04:00
7e1fa9d63e
changes file for 14391
2015-04-15 10:34:19 -04:00
7e6437babc
chagnes file for 15542
2015-04-15 09:40:27 -04:00
59e753a4a6
Make --hash-password imply --hush to prevent unnecessary noise.
2015-04-15 09:39:41 -04:00
ba2485f7df
Remove USE_OPENSSL_BASE64 and the associated code.
...
The alternative has been available since 2007, there's no way to
actually enable the ifdef, and it breaks on well formed but not OpenSSL
style inputs.
2015-04-10 09:12:47 +00:00
f9327848ba
Collect badness values in ntor_ref.py; don't just clobber.
...
Fixes bug 15591; patch from joelanders
2015-04-09 11:57:55 -04:00
202bbfbaa4
Merge branch 'bug15604_squashed'
2015-04-07 15:15:54 -04:00
fda2aa7703
Set ConnDirectionStatistics back to 0 if not running as relay.
2015-04-07 15:15:28 -04:00
edde1a7844
Merge branch 'bug15541_squashed'
2015-04-07 14:09:55 -04:00
e89c200c47
Print the error message for --dump-config even if no arguments are given.
2015-04-07 14:09:41 -04:00
636495257b
Improve descriptions of statistics-related torrc options.
2015-04-07 14:04:03 -04:00
a201a5396e
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-04-06 09:26:28 -04:00
0475552140
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-06 09:26:16 -04:00
fe69a7e1d7
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-06 09:25:37 -04:00
7451b4cafe
Changes file for bug15601
2015-04-06 09:24:16 -04:00
49ddd92c11
Validate the RSA key size received when parsing INTRODUCE2 cells.
...
Fixes bug 15600; reported by skruffy
2015-04-06 09:18:17 -04:00
24352d0d70
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-04-03 09:47:57 -04:00
929a8f199b
Decrease the amount of rend circ relaunches for hidden services.
2015-04-03 09:47:40 -04:00
c1b36488e9
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-03 09:39:19 -04:00
3781955f07
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-03 09:38:54 -04:00
01e4bc80cd
Merge branch 'bug15515_024' into maint-0.2.4
2015-04-03 09:36:59 -04:00
8dba8a088d
Block multiple introductions on the same intro circuit.
2015-04-03 09:35:47 -04:00
05fbbfe472
Merge remote-tracking branch 'public/remove_old_version_checks'
2015-04-01 14:02:02 -04:00
d366c3354f
Merge branch 'remove_digests'
2015-04-01 13:53:03 -04:00
cd8f13b5cb
Merge branch 'bug13736'
2015-04-01 13:46:50 -04:00
aa7b792250
Merge remote-tracking branch 'yawning/feature15435'
2015-04-01 13:34:14 -04:00
34fa4ad637
Merge remote-tracking branch 'public/bug15515_025'
2015-04-01 12:59:19 -04:00
a7eae4ddc5
Block multiple introductions on the same intro circuit.
2015-04-01 12:58:52 -04:00
fec3091129
add changes file for 15296.
2015-04-01 12:52:00 -04:00
0ddd8f06a9
Merge remote-tracking branch 'yawning/feature15471'
2015-04-01 12:47:16 -04:00
c66dd17980
Drop support for --digests
...
This is a fair amount of maintainance burden, and doesn't help much
more than the git microversion.
Closes ticket 14742.
2015-04-01 09:54:20 -04:00
02c3879f87
Merge remote-tracking branch 'teor/ticket15431-event-mask-tests'
2015-03-31 14:57:04 -04:00
30e933b136
Merge branch 'ticket14710_squashed'
2015-03-31 14:37:09 -04:00
b49ffb2a21
Changes file for 14710.
2015-03-31 14:37:03 -04:00
Nick Mathewson
Yawning Angel
teor
David Goulet
Andrea Shepard
cypherpunks
rl1987
George Kadianakis