torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
27,027 Commits 53 Branches 631 Tags
c35416ab8fbb360fded3db875eb252ba1a9b3273
Commit Graph
6051 Commits
Author SHA1 Message Date
Nick Mathewson c35416ab8f Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-31 12:51:45 -05:00
David Goulet df312b3cf6 hs-v3: Remove a BUG() when storing a descriptor in the client cache 
It is possible in normal circumstances that  a client fetches a descriptor
that has a lower revision counter than the one in its cache. This can happen
due to HSDir desync.

Fixes #24976

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-01-31 12:51:42 -05:00
Nick Mathewson 3d7f134bea Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-31 09:50:24 -05:00
Nick Mathewson e81896adda Merge branch 'maint-0.3.1' into maint-0.3.2 2018-01-31 09:50:24 -05:00
Nick Mathewson 6b629d3095 Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-31 09:19:55 -05:00
Nick Mathewson ee5c624beb When a tor_cert_T check fails, log the reason why. 
Diagnostic attempt for 24972.
 2018-01-26 13:55:25 -05:00
Nick Mathewson 9c2bc441f8 If out-of-disk when saving a consensus cache entry, don't BUG. 
Just warn instead.

Fixes bug 24859.
 2018-01-26 13:14:14 -05:00
Nick Mathewson 677bebda70 Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-24 12:09:07 -05:00
Nick Mathewson 6ba2881aec Fix a memory leak in scheduler/loop_kist 
Fixes bug 25005.
 2018-01-24 12:07:45 -05:00
Nick Mathewson 03eb2037d1 Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-19 16:30:53 -05:00
David Goulet f870f9c8bc Merge branch 'bug24895_031_02' into bug24895_032_02 2018-01-19 16:26:26 -05:00
David Goulet f98f7ca898 Merge branch 'bug24895_029_02' into bug24895_031_02 2018-01-19 16:21:55 -05:00
Roger Dingledine 490ae26b24 hs: Use hs_service_max_rdv_failures consensus param, defaulting to 2 2018-01-19 16:13:54 -05:00
Roger Dingledine a15eb9ff43 MAX_REND_FAILURES is 1, but we would try three times 
Fix an "off by 2" error in counting rendezvous failures on the onion
service side.

While we thought we would stop the rendezvous attempt after one failed
circuit, we were actually making three circuit attempts before giving up.

Fixes bug 24895; bugfix on 0.0.6.
 2018-01-19 02:28:55 -05:00
Nick Mathewson 44388757c4 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-01-18 08:13:48 -05:00
Nick Mathewson c9b4ddc882 Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-18 08:13:48 -05:00
Nick Mathewson f406b9df05 Merge branch 'bug24826_031' into maint-0.3.1 2018-01-18 08:13:45 -05:00
Nick Mathewson 4bfc355799 Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-17 11:12:33 -05:00
Nick Mathewson 4e653ac2ca Merge branch 'maint-0.3.1' into maint-0.3.2 2018-01-17 11:12:15 -05:00
Nick Mathewson b1267114cf Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-17 10:50:58 -05:00
Nick Mathewson f02c6bcad0 Merge remote-tracking branch 'arma/bug24894' into maint-0.3.2 2018-01-17 10:49:45 -05:00
Nick Mathewson 7e96767825 Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-16 13:35:55 -05:00
Nick Mathewson 0cb89eb828 Merge remote-tracking branch 'public/bug24652_032' into maint-0.3.2 2018-01-16 13:35:52 -05:00
Nick Mathewson 4bb831e087 Improve fragile-hardening performance of consensus_split_lines. 
For whatever reason, in my testing, using memchr() here improves
performance over strchr() by a great deal.

Fixes bug 24826; bugfix on 0.3.1.1-alpha.
 2018-01-16 12:42:40 -05:00
Roger Dingledine af8cadf3a9 Remove false positives from channel_is_client() 
Fix a set of false positives where relays would consider connections
to other relays as being client-only connections (and thus e.g.
deserving different link padding schemes) if those relays fell out
of the consensus briefly.

Now we look only at the initial handshake and whether the connection
authenticated as a relay.

Fixes bug 24898; bugfix on 0.3.1.1-alpha.
 2018-01-15 22:33:40 -05:00
Roger Dingledine 7ce335c921 v3 onion services now obey MAX_REND_FAILURES 
New-style (v3) onion services now obey the "max rendezvous circuit
attempts" logic.

Previously they would make as many rendezvous circuit attempts as they
could fit in the MAX_REND_TIMEOUT second window before giving up.

Fixes bug 24894; bugfix on 0.3.2.1-alpha.
 2018-01-15 16:41:47 -05:00
Nick Mathewson dbea64aab6 Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-11 20:00:43 -05:00
Nick Mathewson 4c651b8c04 Note contactinfo and myfamily as required in more places 
Includes a sentence from cypherpunks; for ticket 24526.
 2018-01-11 20:00:18 -05:00
Nick Mathewson ea6f3e329d Start 0.3.2.9 changelog. 2018-01-08 11:45:21 -05:00
Nick Mathewson e3ab27001f Merge branch 'maint-0.3.0' into maint-0.3.1 2018-01-08 11:10:36 -05:00
Nick Mathewson 5ff2d8d770 Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-08 11:10:36 -05:00
Nick Mathewson 1c5c5f0e50 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-01-08 11:10:36 -05:00
Nick Mathewson b85fa0bd5f Merge branch 'maint-0.2.9' into maint-0.3.0 2018-01-08 11:10:36 -05:00
Nick Mathewson 9464da210d Add changes file for new fallback directory list. 2018-01-08 11:09:08 -05:00
Nick Mathewson efba81e3bb Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-08 09:35:55 -05:00
Nick Mathewson 748ad2124d Merge branch 'maint-0.3.1' into maint-0.3.2 2018-01-08 09:35:55 -05:00
Nick Mathewson a1ce1ab201 Merge branch 'maint-0.3.0' into maint-0.3.1 2018-01-08 09:34:57 -05:00
Nick Mathewson 8042c356f4 Merge branch 'maint-0.2.9' into maint-0.3.0 2018-01-08 09:34:56 -05:00
Nick Mathewson 26e28829da Merge branch 'maint-0.2.5' into maint-0.2.9 2018-01-08 09:34:56 -05:00
Karsten Loesing 8efbeb0982 Update geoip and geoip6 to the January 5 2018 database. 2018-01-08 11:36:38 +01:00
Nick Mathewson 8edc0be74b Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-05 16:41:35 -05:00
Nick Mathewson 48d94e290d Merge branch 'maint-0.3.0' into maint-0.3.1 2018-01-05 16:41:34 -05:00
Nick Mathewson 16fd975a82 Merge branch 'maint-0.2.9' into maint-0.3.0 2018-01-05 16:41:34 -05:00
Nick Mathewson 3618bd6166 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-01-05 16:41:34 -05:00
Nick Mathewson c52d4d9e34 Merge branch 'teor_ticket24681_028' into maint-0.2.9 2018-01-05 16:41:31 -05:00
Nick Mathewson 2ac9734bd2 Use -lresolv in LIBS with rust on OSX. 
This fixes issue #24652, and is a workaround for Rust issue
https://github.com/rust-lang/rust/issues/46797 .
 2018-01-04 14:02:24 -05:00
Nick Mathewson c7c043d2b6 Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-03 10:08:48 -05:00
Nick Mathewson 1bc95633fb Fix some shadowed-global warnings. 
These are all about local variables shadowing global
functions. That isn't normally a problem, but at least one
compiler we care about seems to treat this as a case of -Wshadow
violation, so let's fix it.

Fixes bug 24634; bugfix on 0.3.2.1-alpha.
 2018-01-03 09:13:00 -05:00
Nick Mathewson 1a070767de Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-03 09:00:00 -05:00
Nick Mathewson 451c852a0f Merge branch 'maint-0.3.1' into maint-0.3.2 2018-01-03 09:00:00 -05:00