Nick Mathewson
cd77ea782e
Merge branch 'neena-fix-1667'
2017-07-05 11:01:36 -04:00
Nick Mathewson
03b6cfd591
Extract "not an HTTP proxy" messages.
2017-07-05 11:01:17 -04:00
Nick Mathewson
46e83477c1
Merge branch 'bug15554_032_01_squashed'
2017-07-05 10:15:24 -04:00
Nick Mathewson
78ac713d60
changes file for 15554
2017-07-05 10:15:17 -04:00
George Kadianakis
17bd118b4c
Add test that parses a hardcoded v2 descriptor.
2017-07-05 10:14:26 -04:00
Nick Mathewson
13ccca69f1
Merge branch 'onionskin_refactor_2'
2017-07-05 10:01:48 -04:00
Nick Mathewson
ef56f073c1
changes file for 22804
2017-07-05 10:01:40 -04:00
Nick Mathewson
093f57cb16
changes file for bug 22750
2017-07-05 09:57:48 -04:00
cypherpunks
c79e286386
Use the proper syscall in sandbox error messages
...
Fixes #22750 .
2017-07-05 09:56:28 -04:00
Nick Mathewson
3402b14089
Merge remote-tracking branch 'asn/ticket22727_032_02'
2017-07-05 09:49:12 -04:00
Nick Mathewson
b6c8530fc3
Merge remote-tracking branch 'dgoulet/ticket22726_032_02'
2017-07-05 09:36:31 -04:00
Roger Dingledine
943d284752
CREATE_FAST is for when you don't know the onion key
...
it isn't (anymore) for when you think you can get away with saving some
crypto operations.
2017-07-03 17:20:52 -04:00
Roger Dingledine
69fba1f2cd
better comments and mild refactoring
2017-07-03 17:13:08 -04:00
Nick Mathewson
9b44e2e50e
Document the new functions from the refactor
2017-07-03 16:54:41 -04:00
Nick Mathewson
2814b86875
Reindent the functions split from circuit_send_next_onion_skin().
...
This is a whitespace change only.
2017-07-03 16:54:41 -04:00
Nick Mathewson
935f84bd40
Split circuit_send_next_onion_skin() into its three main cases.
...
This commit is designed to have a very small diff. Therefore,
the indentation is wrong. The next commit will fix that.
2017-07-03 16:54:41 -04:00
Nick Mathewson
2778032f4a
Merge branch 'maint-0.3.1'
2017-07-03 13:26:38 -04:00
Nick Mathewson
d011126467
Update fuzzing_include_am to include updates from include.am
2017-07-03 13:24:57 -04:00
Roger Dingledine
0fe7c42e0e
general formatting / whitespace / typo fixes
2017-07-01 17:56:06 -04:00
Nick Mathewson
bbc1b3c1ae
Add 0.3.1.4-alpha to changelog
2017-06-29 18:48:06 -04:00
Nick Mathewson
700ecce265
Add 0.3.0.9 to changelog and releasenotes
2017-06-29 18:47:24 -04:00
Nick Mathewson
e0aa6bee4a
Merge branch 'maint-0.3.1'
...
"ours" merge to avoid version bump.
2017-06-29 18:45:57 -04:00
Nick Mathewson
83dc072e67
Bump version to 0.3.1.4-alpha-dev
2017-06-29 18:45:49 -04:00
Nick Mathewson
6f2657dbcf
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid version bump.
2017-06-29 18:44:53 -04:00
Nick Mathewson
d9427c00df
bump to 0.3.0.9-dev
2017-06-29 18:44:43 -04:00
Nick Mathewson
fb33bcbcf0
Merge branch 'maint-0.3.1'
...
"ours" merge to avoid version bump.
2017-06-29 16:36:58 -04:00
Nick Mathewson
a53573559f
Bump 0.3.1 to 0.3.1.4-alpha
2017-06-29 16:36:50 -04:00
Nick Mathewson
1494fa0d3b
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid version bump.
2017-06-29 16:36:05 -04:00
Nick Mathewson
98ffb2e722
Update maint-0.3.0 to 0.3.0.9
2017-06-29 16:35:40 -04:00
Nick Mathewson
71b9f4f0bb
Merge branch 'maint-0.3.1'
2017-06-29 15:57:49 -04:00
Nick Mathewson
1712dc98b0
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-06-29 15:57:48 -04:00
Nick Mathewson
52c4440c48
Merge branch 'trove-2017-006' into maint-0.3.0
2017-06-29 15:57:42 -04:00
Nick Mathewson
3781678a3c
Merge branch 'maint-0.3.1'
2017-06-29 11:38:06 -04:00
Nick Mathewson
31a08ba26f
Merge remote-tracking branch 'public/bug22670_031' into maint-0.3.1
2017-06-29 11:34:06 -04:00
Nick Mathewson
2c718c1a12
Merge branch 'maint-0.3.1'
2017-06-29 10:43:50 -04:00
Nick Mathewson
bb5968cae1
Merge branch 'ticket22684'
2017-06-29 10:16:15 -04:00
Nick Mathewson
88666d0482
Adjust unit tests to account for fix to bug 22753.
...
Our mock network put all the guards on the same IPv4 address, which
doesn't fly when we start applying EnforceDistinctSubnets. So in
this commit, I disable EnforceDistinctSubnets when running the old
guard_restriction_t test.
This commit also adds a regression test for #22753 .
2017-06-29 10:11:21 -04:00
Nick Mathewson
665baf5ed5
Consider the exit family when applying guard restrictions.
...
When the new path selection logic went into place, I accidentally
dropped the code that considered the _family_ of the exit node when
deciding if the guard was usable, and we didn't catch that during
code review.
This patch makes the guard_restriction_t code consider the exit
family as well, and adds some (hopefully redundant) checks for the
case where we lack a node_t for a guard but we have a bridge_info_t
for it.
Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked as TROVE-2016-006
and CVE-2017-0377.
2017-06-29 09:57:00 -04:00
Nick Mathewson
0ac8f0bde9
Changes file for bug22752 diagnostics
2017-06-28 14:27:52 -04:00
Nick Mathewson
a088a08eeb
Log real error message when unable to remove a storagedir file
...
Attempts to help diagnose 22752.
2017-06-28 14:24:27 -04:00
Nick Mathewson
de5f0d8ba7
Replace crash on missing handle in consdiffmgr with nonfatal assert
...
Attempts to mitigate 22752.
2017-06-28 14:21:21 -04:00
Nick Mathewson
0f3084c4f2
Merge branch 'maint-0.3.1'
2017-06-28 14:03:23 -04:00
Nick Mathewson
4c21d4ef7a
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-28 14:03:23 -04:00
Nick Mathewson
912f366bd5
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-06-28 14:03:23 -04:00
Nick Mathewson
ec9c6d7723
Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9
2017-06-28 14:03:20 -04:00
Nick Mathewson
0c1586d1b8
Merge branch 'maint-0.3.1'
2017-06-28 13:58:37 -04:00
Nick Mathewson
aa5af6a238
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-28 13:58:37 -04:00
Nick Mathewson
054d7c57f6
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-06-28 13:58:37 -04:00
Nick Mathewson
4060253749
Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9
2017-06-28 13:57:54 -04:00
Nick Mathewson
590cfe2b89
Merge branch 'maint-0.3.1'
2017-06-28 13:54:12 -04:00
