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
26,865 Commits 53 Branches 631 Tags
de3cf40fa658d62a61bb620c9dba8e90105da339
Commit Graph

26865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson de3cf40fa6 Merge remote-tracking branch 'dgoulet/bug24895_032_02' into maint-0.3.2 2018-01-19 16:30:44 -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
Nick Mathewson e2aacf100f Merge branch 'maint-0.3.1' into maint-0.3.2 2018-01-19 10:18:29 -05:00
Nick Mathewson 483a59ec2a Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1 2018-01-19 10:18:21 -05:00
Nick Mathewson 9b19e33bed Merge branch 'maint-0.3.0' into maint-0.3.1 
"ours" merge to avoid 0.2.5 version of #24863 fix.
 2018-01-19 10:17:33 -05:00
Nick Mathewson 1cf11b6940 Merge branch 'maint-0.2.9' into maint-0.3.0 2018-01-19 10:17:05 -05:00
Nick Mathewson 36567c5ca4 Merge branch 'maint-0.2.5' into maint-0.2.9 2018-01-19 10:16:47 -05:00
Roger Dingledine cc5a9e9667 turn MAX_REND_FAILURES into a function 
no actual changes in behavior
 2018-01-19 02:38:07 -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 f406b9df05 Merge branch 'bug24826_031' into maint-0.3.1 2018-01-18 08:13:45 -05:00
Taylor Yu 0e7f1b06e9 Work around Travis CI ptrace regression 
Travis CI deployed a change that disables ptrace capabilities in
container builds, which prevents LeakSanitizer on clang from working
properly.  Set "sudo: required" to force non-container builds for
clang and work around this.
 2018-01-17 14:10:04 -06:00
Taylor Yu 49de586add Work around Travis CI ptrace regression 
Travis CI deployed a change that disables ptrace capabilities in
container builds, which prevents LeakSanitizer on clang from working
properly.  Set "sudo: required" to force non-container builds for
clang and work around this.
 2018-01-17 13:40:34 -06: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 f02c6bcad0 Merge remote-tracking branch 'arma/bug24894' into maint-0.3.2 2018-01-17 10:49:45 -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
Sebastian Hahn db5aa54a42 Reword requirement to set Myfamily correctly 2018-01-11 20:00:23 -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 34c6034aa7 Increment version to 0.3.2.9-dev 2018-01-09 10:12:25 -05:00
Nick Mathewson 1f7f930f9e Increment version to 0.3.2.9 2018-01-08 11:39:24 -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 e3ab27001f Merge branch 'maint-0.3.0' into maint-0.3.1 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 9464da210d Add changes file for new fallback directory list. 2018-01-08 11:09:08 -05:00
Nick Mathewson a42e52dded Add 7 other fallback dirs from teor's tests 
These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc"
 2018-01-08 11:03:44 -05:00
Nick Mathewson 491c09c19a Update the fallback_dirs.inc file: part 1 
This takes the updated fallback_dirs_2018_01_06_CA.inc from
pastly's scan.
 2018-01-08 10:57:06 -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
Roger Dingledine 5f2c7a8567 remove redundant "implement this" from log message 2018-01-05 18:23:07 -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 94d5523c7f fix a wide line 2018-01-05 11:28:23 -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 9ef97a268b Merge branch 'bug24634' into maint-0.3.2 2018-01-03 10:08:36 -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 451c852a0f Merge branch 'maint-0.3.1' into maint-0.3.2 2018-01-03 09:00:00 -05:00
Nick Mathewson c1d98c75e3 Merge branch 'maint-0.3.0' into maint-0.3.1 2018-01-03 08:59:59 -05:00
Nick Mathewson bbc9ff160e Merge branch 'maint-0.2.9' into maint-0.3.0 2018-01-03 08:59:59 -05:00
Nick Mathewson c9b3f6352f Merge branch 'bug24633_029' into maint-0.2.9 2018-01-03 08:59:52 -05:00
Nick Mathewson 2aa1767b25 Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2 2018-01-02 14:42:27 -05:00