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,447 Commits 53 Branches 631 Tags
811ed8cf9f58d8480244483f4ad012ea9dca42ef
Commit Graph

29447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nick Mathewson 9ae3597540 Tweak assertion in get_time_period_length() for coverity 
This is another attempt to fix 1437668.  The assertion here should
be safe, since the rules of networkstatus_get_param() keep the value
it returns in range.
 2018-07-20 11:02:07 -04: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 3c49019016 Merge branch 'maint-0.3.4' 2018-07-19 14:34:26 -04:00
Nick Mathewson 7260d07fee Fix linking when dirauth module is disabled. 
Bugfix on dcee4d4c9c, bug not in any
released Tor.
 2018-07-19 14:33:18 -04:00
Nick Mathewson c1092e9aab Merge remote-tracking branch 'ahf-github/bugs/26780' 2018-07-19 12:22:39 -04:00
Nick Mathewson 7253603e6b Merge branch 'bug26712' 2018-07-19 12:20:13 -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
Roger Dingledine 144fc9bef1 wrap a multi-line if body in { } before somebody gets hurt 2018-07-18 21:23:35 -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 9f615fa422 Merge branch 'maint-0.3.4' 2018-07-18 16:39:11 -04:00
Nick Mathewson 9e247ac271 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-07-18 16:39:10 -04:00
Nick Mathewson 39d3187b0d Merge branch 'maint-0.3.3' into maint-0.3.4 2018-07-18 16:39:10 -04:00
Nick Mathewson 78386d8cdd Merge branch 'maint-0.2.9' into maint-0.3.2 2018-07-18 16:39:10 -04:00
Nick Mathewson 501deba8cf Try putting ulimit -c 0 in test_bt.sh to see if it fixes bug 26787 2018-07-18 16:33:48 -04:00
Nick Mathewson c43e81a5a3 Merge remote-tracking branch 'teor/ticket26702-atomically' 2018-07-18 16:30:11 -04:00
Nick Mathewson 42c02097db Add two more dependencies in build.rs 2018-07-18 16:20:31 -04:00
Nick Mathewson 0c4c5eeb55 Use the "testing" variant of several C libraries in build.rs 2018-07-18 16:18:25 -04:00
Nick Mathewson e2261e7727 Merge remote-tracking branch 'isis/bug26398' 2018-07-18 16:12:29 -04:00
Nick Mathewson 23811052fe Add some missing includes and struct declarations. 2018-07-18 15:12:18 -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 fd5dce0a1b Add a test for format_recommended_version_list. 2018-07-18 15:00:53 -04:00
Nick Mathewson 8ee1fe7aa7 Warn when an authority has voted for a version with a space in it. 
Another way to try to prevent a recurrence of 26485.
 2018-07-18 15:00:53 -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
Nick Mathewson 88bb80d5fc Merge remote-tracking branch 'teor/ticket26852' 2018-07-18 13:20:23 -04:00
Nick Mathewson ef5c3c8216 Merge branch 'ulimit_when_crashing' 2018-07-18 09:38:04 -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
teor 62ecb5e88f doc: Document Appveyor and Jenkins in doc/HACKING/HelpfulTools.md 
Closes 26852.
 2018-07-18 12:11:08 +10:00
teor 08b82409d4 doc: Explain how to avoid inconsistent reads on V3BandwidthsFile 
Closes 26702.
 2018-07-18 11:14:18 +10:00
Nick Mathewson e2b744ce38 Merge branch 'bug25552_ope_squashed' 2018-07-17 16:19:32 -04:00
George Kadianakis 14b507e520 Improve a log message. 2018-07-17 15:57:46 -04:00