db2f18b1f9
Merge branch 'maint-0.3.0'
2017-06-05 12:02:47 -04:00
578a4392e9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-05 12:02:26 -04:00
d75be189df
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-06-05 12:02:15 -04:00
33fcc0f61d
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-06-05 12:01:17 -04:00
3f2d1f7f07
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-06-05 12:00:41 -04:00
9ea3d0877a
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-06-05 12:00:27 -04:00
1a540b5792
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-06-05 12:00:08 -04:00
e3ebae4804
Fix undefined behavior in geoip_parse_entry().
...
Fixes bug 22490; bugfix on 6a241ff3ff
2017-06-05 10:09:39 -04:00
26d9fffae4
Merge branch 'bug22466_diagnostic_030'
2017-06-05 09:52:09 -04:00
be741d7e63
Merge branch 'maint-0.3.0'
2017-06-05 09:51:57 -04:00
41ed9e978b
Regenerate RSA->ed25519 identity crosscertificate as needed
2017-06-01 10:04:52 -04:00
f2068ef862
Use tor_assert_nonfatal() to try to detect #22466
2017-06-01 09:42:32 -04:00
5860f0a7c8
Update the torify.1 manpage
...
I went into this to fix 6892 and say "we don't do anything for
circuit isolation." But instead I did a fair amount of text-removal
to stop implying that torify does anything more than call torsocks.
2017-05-30 14:15:42 -04:00
4a15b31696
Merge remote-tracking branch 'argonblue/bug22413'
2017-05-30 13:33:49 -04:00
90dd7dc92a
Check for libzstd >= 1.1
...
The consensus compression code depends on a streaming compression API
that is new in libzstd-1.1.
Fixes #22413 .
2017-05-30 13:25:34 -04:00
5b33d95a3d
hs: Correctly validate v3 descriptor encrypted length
...
The encrypted_data_length_is_valid() function wasn't validating correctly the
length of the encrypted data of a v3 descriptor. The side effect of this is
that an HSDir was rejecting the descriptor and ultimately not storing it.
Fixes #22447
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-05-30 10:27:42 -04:00
671c5dcde3
Merge remote-tracking branch 'public/bug6298'
2017-05-30 10:27:37 -04:00
0fbe1a2c6f
Merge remote-tracking branch 'teor/bug22424'
2017-05-30 08:50:45 -04:00
6bc9ff87b8
changes file for 22417
2017-05-30 08:48:50 -04:00
167e5be056
changes file for 22446
2017-05-30 08:33:27 -04:00
af891e7f2c
Changes file for bug 22424
2017-05-28 22:34:56 +10:00
159a8061cf
Mock tor_addr_lookup() during part of addr/basic test.
...
If this function isn't mocked, then our unit tests break on stupid
networks where localhost is broken or absent. Fixes bug 6298; bugfix
on 0.0.9pre2.
2017-05-26 13:53:32 -04:00
8cd01f5e5b
Start an 0.3.1.2-alpha mini-changelog
2017-05-26 09:00:38 -04:00
ab9976b724
Merge remote-tracking branch 'arma/bug22368'
2017-05-25 08:54:51 -04:00
657297a9f8
Merge branch 'maint-0.3.0'
2017-05-25 00:28:11 -04:00
83439e78cc
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-05-25 00:27:27 -04:00
ec61ae59a5
Stop leaking keypin-rejected routerinfos on directory authorities
...
When directory authorities reject a router descriptor due to keypinning,
free the router descriptor rather than leaking the memory.
Fixes bug 22370; bugfix on 0.2.7.2-alpha.
2017-05-25 00:09:40 -04:00
d22d565331
add copy of MyFamily element to the descriptor, not the element itself
...
If we add the element itself, we will later free it when we free the
descriptor, and the next time we go to look at MyFamily, things will
go badly.
Fixes the rest of bug 22368; bugfix on 0.3.1.1-alpha.
2017-05-24 23:37:00 -04:00
b80a35e683
Improve the message we log on unexpected dirauth status code
...
It's still not great, but should be less confusing what's wrong
here.
Closes ticket 1121.
2017-05-24 09:08:59 -04:00
94754c5414
Fold new entries into changelog
2017-05-22 11:40:52 -04:00
3d27954f2e
amend changes file to note that one case is still unfixed
2017-05-22 09:10:00 -04:00
b2e9a107b7
Merge remote-tracking branch 'asn/bug21969_bridges'
2017-05-22 09:09:16 -04:00
52498b8183
Set guard state on bridge descriptor fetches.
...
We used to not set the guard state in launch_direct_bridge_descriptor_fetch().
So when a bridge descriptor fetch failed, the guard subsystem would never
learn about the fail (and hence the guard's reachability state would not
be updated).
2017-05-22 15:57:33 +03:00
90894c87a5
Merge branch 'maint-0.3.0'
2017-05-22 08:32:18 -04:00
5c52d3c2c0
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-05-22 08:32:07 -04:00
6e5486b11a
dir auths reject 0.2.9.x for x<5, due to bug 20499
...
Directory authorities now reject relays running versions
0.2.9.1-alpha through 0.2.9.4-alpha, because those relays
suffer from bug 20499 and don't keep their consensus cache
up-to-date.
Resolves ticket 20509.
2017-05-22 08:31:39 -04:00
8410f47b6e
start changelog for 0.3.1.1-alpha by sorting entries
2017-05-19 10:00:54 -04:00
3c6d5e10a0
changelog entry for 22106
2017-05-19 09:10:23 -04:00
92d335b3dc
Merge remote-tracking branch 'jigsaw/torrc-dir-fix-1922_squashed2'
2017-05-19 08:46:13 -04:00
ba3a5f82f1
Add support for %include funcionality on torrc #1922
...
config_get_lines is now split into two functions:
- config_get_lines which is the same as before we had %include
- config_get_lines_include which actually processes %include
2017-05-18 23:44:16 +01:00
b214c2c095
Merge branch 'maint-0.3.0'
2017-05-18 10:06:27 -04:00
935cd77f62
Merge branch 'bug22252_029' into maint-0.3.0
2017-05-18 10:06:06 -04:00
2ba58f275c
Fix crash when starting with LearnCircuitBuildTimeout 0.
...
Before we've set our options, we can neither call get_options() nor
networkstatus_get_latest_consensus().
Fixes bug 22252; bugfix on 4d9d2553ba
2017-05-16 11:20:12 -04:00
222534d354
Fix remaining (non-false-positive) lintchanges complaints
2017-05-16 10:32:00 -04:00
d29f494ec2
Merge branch 'maint-0.3.0'
2017-05-16 08:39:36 -04:00
492f8a7c44
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-05-16 08:39:22 -04:00
a7bcab2639
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-05-16 08:38:59 -04:00
7bb2cd0c8e
Merge remote-tracking branch 'teor/fallback-inputs'
2017-05-16 08:35:02 -04:00
bdac1a431f
Merge remote-tracking branch 'teor/fallback-usage'
2017-05-16 08:32:54 -04:00
74e7be1c25
fill in a few more blanks in the changes files
2017-05-16 08:10:39 -04:00
Nick Mathewson
Taylor Yu
David Goulet
teor
Roger Dingledine
George Kadianakis
Daniel Pinto