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
29,483 Commits 53 Branches 631 Tags
ff593ae8781941bfe035d43ded5c18eb772ac486
Commit Graph

6901 Commits

Author SHA1 Message Date
Nick Mathewson ff593ae878 Merge remote-tracking branch 'rl1987/feature19506_3' 2018-07-30 08:55:57 -04:00
Nick Mathewson 13393b2d91 Merge remote-tracking branch 'rl1987/ticket21349_4' 2018-07-30 08:49:49 -04:00
Nick Mathewson ec1ced3cc1 Merge remote-tracking branch 'teor/bug26924' 2018-07-30 08:44:58 -04:00
Nick Mathewson ac9d08f66a Merge remote-tracking branch 'juga/ticket3723_03_squashed_rebased' 2018-07-30 08:33:59 -04:00
Nick Mathewson 811ed8cf9f Merge remote-tracking branch 'rl1987/bug26892_take2' 2018-07-30 08:24:14 -04:00
Nick Mathewson 5823e62fa2 Merge branch 'maint-0.3.4' 2018-07-30 08:17:25 -04:00
Nick Mathewson d102e9c2e4 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-07-30 08:17:25 -04:00
Nick Mathewson 15d7f24c57 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-07-30 08:17:24 -04:00
Taylor Yu a8bdb851eb Don't disable an unsupported compiler warning 
Conditionalize the pragma that temporarily disables
-Wunused-const-variable.  Some versions of gcc don't support it.  We
need to do this because of an apparent bug in some libzstd headers.
Fixes bug 26785; bugfix on 0.3.2.11.
 2018-07-26 12:32:34 -05:00
rl1987 ffdfd39d4f Early bailout from log_addr_has_changed() if running as client 2018-07-26 17:49:27 +03:00
teor d01602bebb Merge branch 'bug26924_032' into bug26924 
Update rendcommon.h include path.
 2018-07-25 14:50:45 +10:00
teor 859d5a7375 Improve connection auth logging 
Improve the log message when connection initiators fail to authenticate
direct connections to relays.

Fixes bug 26927; bugfix on 0.3.0.1-alpha.
 2018-07-25 14:39:31 +10:00
teor fdc3ad6259 Merge branch 'bug26924_029' into bug26924_032 2018-07-25 14:33:10 +10:00
teor 6443812e34 Stop logging link auth warnings on Single Onion Services and Tor2web 
Instead, log a protocol warning when single onion services or
Tor2web clients fail to authenticate direct connections to relays.

Fixes bug 26924; bugfix on 0.2.9.1-alpha.
 2018-07-25 14:30:33 +10:00
juga0 6d59ab16a0 Add changes file regarding bandwidth file headers 2018-07-23 00:58:31 +00:00
rl1987 e9f6f742b2 Add changes file 2018-07-21 18:38:33 +03:00
Nick Mathewson 977821e59f Merge branch 'maint-0.3.3' into maint-0.3.4 2018-07-20 10:42:29 -04:00
Nick Mathewson dbf57ecf39 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-07-20 10:42:29 -04:00
Nick Mathewson 583df33e20 Merge branch 'maint-0.3.4' 2018-07-20 10:42:29 -04:00
Nick Mathewson be3a962ca7 Merge branch 'ticket26647_032' into maint-0.3.2 2018-07-20 10:42:23 -04:00
Nick Mathewson b44fce6716 Merge branch 'maint-0.3.4' 2018-07-19 08:32:00 -04:00
Nick Mathewson 0a60a94a55 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-07-19 08:31:07 -04:00
Nick Mathewson 27f5bd52fe Merge branch 'maint-0.3.3' into maint-0.3.4 2018-07-19 08:31:07 -04:00
Nick Mathewson 209332e71a Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2 2018-07-19 08:30:59 -04:00
Nick Mathewson e0f99404f5 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-07-18 16:39:25 -04:00
Nick Mathewson d5dd500e36 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-07-18 16:39:25 -04:00
Nick Mathewson 312a42fc85 Merge branch 'maint-0.2.9' into maint-0.3.2 2018-07-18 16:39:25 -04:00
Nick Mathewson 64af15d373 Merge branch 'maint-0.3.4' 2018-07-18 16:39:25 -04:00
Nick Mathewson 93da2cae49 Changes file for bug 26787 2018-07-18 16:39:22 -04:00
Nick Mathewson 61e080e24a Merge branch 'maint-0.3.4' 2018-07-18 15:09:28 -04:00
Nick Mathewson a7bd20ebaf Merge branch 'maint-0.3.3' into maint-0.3.4 2018-07-18 15:08:57 -04:00
Nick Mathewson c31700d664 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-07-18 15:04:14 -04:00
Nick Mathewson 559f79fd79 Merge branch 'maint-0.2.9' into maint-0.3.2 2018-07-18 15:03:27 -04:00
Nick Mathewson a321d72401 Merge branch 'bug26485_029_squashed' into maint-0.2.9 2018-07-18 15:01:03 -04:00
Nick Mathewson dcee4d4c9c Warn the directory authority operator if their versions list is bogus 
Prevents bug 26485; bugfix on 0.1.1.6-alpha.
 2018-07-18 15:00:53 -04:00
teor 449d190e2e SKIP test_key_expiration.sh on Windows until the underlying issue is resolved 
Skip an unreliable key expiration test on Windows, until the underlying
issue in bug 26076 is resolved.

Fixes bug 26853; bugfix on 0.3.2.1-alpha.
 2018-07-18 12:37:12 +10:00
Nick Mathewson e2b744ce38 Merge branch 'bug25552_ope_squashed' 2018-07-17 16:19:32 -04:00
George Kadianakis f00b7a7faa Add changes file. 2018-07-17 15:57:46 -04:00
Nick Mathewson 304ee896d1 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-07-17 14:56:52 -04:00
Nick Mathewson 28d1057d56 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-07-17 14:56:52 -04:00
Nick Mathewson 61a2762e35 Merge branch 'maint-0.2.9' into maint-0.3.2 2018-07-17 14:56:52 -04:00
Nick Mathewson 12afdcc15a Merge branch 'maint-0.3.4' 2018-07-17 14:56:52 -04:00
teor 6dafddd05d SKIP test_keygen.sh on Windows until the underlying issue is resolved 
Skip an unreliable key generation test on Windows, until the underlying
issue in bug 26076 is resolved.

Fixes bug 26830; bugfix on 0.2.7.3-rc.
 2018-07-17 14:56:18 -04:00
Nick Mathewson 4833717d69 Merge branch 'maint-0.3.4' 2018-07-17 14:46:16 -04:00
Nick Mathewson c7dcf252fd Merge remote-tracking branch 'ahf-github/bugs/26437' 2018-07-17 14:33:31 -04:00
rl1987 8645647250 Fix build to work with --disable-unittests again 2018-07-17 12:09:34 +00:00
David Goulet 5aaea38d88 Merge remote-tracking branch 'pastly/issue26703' 2018-07-16 14:44:45 -04:00
Nick Mathewson ef234ba303 Merge branch 'socks_trunnel4_squashed_merged' 2018-07-15 17:07:20 -04:00
Nick Mathewson f608cc0f31 Merge remote-tracking branch 'tor-github/pr/179' 2018-07-13 18:30:17 -04:00
Taylor Yu 7585523cfc Add changes file for ticket 26492 2018-07-13 12:34:23 -05:00