nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,253 Commits 53 Branches 630 Tags 125 MiB
1d864987cb
Commit Graph

28253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson
df9d2de441 Merge remote-tracking branch 'fristonio/ticket4187' 2018-03-03 12:02:30 -05:00
Nick Mathewson
338dbdab93 Merge branch 'maint-0.3.3' 2018-03-03 11:59:27 -05:00
Nick Mathewson
ccf0f77da1 changes file for 25378 2018-03-03 11:58:22 -05:00
Alexander Færøy
59a7b00384 Update tor.1.txt with the currently available log domains. 
See: https://bugs.torproject.org/25378
 2018-03-03 11:58:14 -05:00
Nick Mathewson
62482ea279 Merge branch 'maint-0.3.3' 2018-03-03 11:53:05 -05:00
Nick Mathewson
cc7de9ce1d Merge branch 'ticket23814' into maint-0.3.3 2018-03-03 11:53:01 -05:00
Nick Mathewson
27c3a1d657 Merge branch 'maint-0.3.3' 
"ours" merge to avoid version bump.
 2018-03-03 11:34:02 -05:00
Nick Mathewson
aec505a310 bump to 0.3.3.3-alpha-dev 2018-03-03 11:33:56 -05:00
Nick Mathewson
35d945a646 Merge branch 'maint-0.3.2' into maint-0.3.3 
"ours" merge to avoid version bump.
 2018-03-03 11:33:33 -05:00
Nick Mathewson
0026d1a673 bump version to 0.3.2.10-dev 2018-03-03 11:33:27 -05:00
Nick Mathewson
d81a5231ee Merge branch 'maint-0.3.1' into maint-0.3.2 
"ours" merge to avoid version bump
 2018-03-03 11:33:02 -05:00
Nick Mathewson
0aa794d309 version bump to 0.3.1.10-dev 2018-03-03 11:32:51 -05:00
Nick Mathewson
2e2aacca2a Merge branch 'maint-0.2.9' into maint-0.3.1 
"ours" merge to avoid version bump.
 2018-03-03 11:32:29 -05:00
Nick Mathewson
9eb6f9d3c8 Bump version to 0.2.9.15-dev 2018-03-03 11:32:16 -05:00
Nick Mathewson
9a14f1ef64 Copy changelog and releasenotes entries from today's releases. 2018-03-03 07:58:12 -05:00
Nick Mathewson
9f35dd9e8a Merge branch 'master' of git-rw.torproject.org:/tor 2018-03-03 07:57:30 -05:00
Roger Dingledine
2bd23cebf3 resolve a weird binary character that crept into the man page 2018-03-02 19:21:45 -05:00
Roger Dingledine
b46bda9d18 get rid of extraneous punctuation in man page 2018-03-02 19:07:04 -05:00
Roger Dingledine
6db6a00671 fix a confusing "0 0" in the man page 
feel free to backport this commit back to 0.3.2.x if you like it
 2018-03-02 18:58:29 -05:00
Alex Xu (Hello71)
45d3b5fa4c Remove uncompilable tor_mmap_file fallback. #25398 2018-03-02 09:51:53 -05:00
Nick Mathewson
6f1fe29e8d Merge branch 'maint-0.3.3' 
"ours" to avoid version bump.
 2018-03-01 16:44:18 -05:00
Nick Mathewson
15f6201a5b increment to 0.3.3.3-alpha 2018-03-01 16:44:07 -05:00
Nick Mathewson
e0903ebd88 Merge branch 'maint-0.3.2' into maint-0.3.3 
"ours" to avoid version bump.
 2018-03-01 16:43:42 -05:00
Nick Mathewson
1ec386561e version bump to 0.3.2.10 2018-03-01 16:43:35 -05:00
Nick Mathewson
5b0ae08400 Merge branch 'maint-0.3.1' into maint-0.3.2 
"ours" to avoid version bump.
 2018-03-01 16:43:10 -05:00
Nick Mathewson
c527a8a9c9 Update to 0.3.1.10 2018-03-01 16:43:01 -05:00
Nick Mathewson
805a785780 Merge branch 'maint-0.2.9' into maint-0.3.1 
"ours" merge to avoid version bump.
 2018-03-01 16:42:25 -05:00
Nick Mathewson
35753c0774 version bump to 0.2.9.15 2018-03-01 16:42:17 -05:00
Nick Mathewson
d22963938f Merge branch 'maint-0.3.3' 2018-03-01 16:10:47 -05:00
Nick Mathewson
f7eff2f8c5 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-03-01 16:10:43 -05:00
Nick Mathewson
d01abb9346 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-03-01 16:07:59 -05:00
Nick Mathewson
d4a758e083 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-03-01 16:07:59 -05:00
Nick Mathewson
c1bb8836ff Protover tests: disable some obsoleted tests 
These were meant to demonstrate old behavior, or old rust behavior.

One of them _should_ work in Rust, but won't because of
implementation details.  We'll fix that up later.
 2018-03-01 16:05:17 -05:00
Nick Mathewson
c5295cc1be Spec conformance on protover: always reject ranges where lo>hi 2018-03-01 16:05:17 -05:00
Nick Mathewson
1fe0bae508 Forbid UINT32_MAX as a protocol version 
The C code and the rust code had different separate integer overflow
bugs here.  That suggests that we're better off just forbidding this
pathological case.

Also, add tests for expected behavior on receiving a bad protocol
list in a consensus.

Fixes another part of 25249.
 2018-03-01 16:05:17 -05:00
Nick Mathewson
8b405c609e Forbid "-0" as a protocol version. 
Fixes part of 24249; bugfix on 0.2.9.4-alpha.
 2018-03-01 16:05:17 -05:00
Nick Mathewson
0953c43c95 Add more of Teor's protover tests. 
These are as Teor wrote them; I've disabled the ones that don't pass
yet, with XXXX comments.
 2018-03-01 16:05:17 -05:00
Nick Mathewson
d3a1bdbf56 Add some protover vote round-trip tests from Teor. 
I've refactored these to be a separate function, to avoid tricky
merge conflicts.

Some of these are disabled with "XXXX" comments; they should get
fixed moving forward.
 2018-03-01 16:05:17 -05:00
Nick Mathewson
a83650852d Add another NULL-pointer fix for protover.c. 
This one can only be exploited if you can generate a correctly
signed consensus, so it's not as bad as 25074.

Fixes bug 25251; also tracked as TROVE-2018-004.
 2018-03-01 16:05:17 -05:00
Nick Mathewson
65f2eec694 Correctly handle NULL returns from parse_protocol_list when voting. 
In some cases we had checked for it, but in others we had not.  One
of these cases could have been used to remotely cause
denial-of-service against directory authorities while they attempted
to vote.

Fixes TROVE-2018-001.
 2018-03-01 16:05:17 -05:00
Taylor Yu
09484b9449 Document how to allow partial Travis failures 
Add some commented-out allow_failures clauses to make it easier to
temporarily allow less-critical sub-builds to fail while still
reporting success.
 2018-03-01 13:18:33 -06:00
Isis Lovecruft
167da4bc81
rust: Remove extra whitespace from a static log/error message. 2018-02-27 20:43:54 +00:00
teor
01a977b492
Update the primitive types explanation in the Rust coding standards 
Part of #25368.
Includes c_double in anticipation of #23061.
 2018-02-27 15:55:13 +11:00
Deepesh Pathak
130e2ffad7
Remove duplicate code between parse_{c,s}method in transport.c 
- Merged common code in function parse_{c,s}method to a single function
- Removed duplicate code in transport.c
- Fixes #6236
 2018-02-24 20:27:08 +05:30
Nick Mathewson
54e25ab124 Remove changes files for items already in 0.3.3. 2018-02-22 09:17:44 -05:00
Nick Mathewson
e87a2759f3 Merge branch 'maint-0.3.3' 2018-02-21 11:56:02 -05:00
Nick Mathewson
d489e4847b Fix a variable name in tor-rust-dependencies 2018-02-21 11:55:25 -05:00
Nick Mathewson
d2bdb54d37 Wrap GettingStartedRust.md to 72 columns. 2018-02-21 11:55:07 -05:00
Nick Mathewson
bcfb034957 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-02-21 11:53:50 -05:00
Nick Mathewson
62c88a6011 Merge branch 'maint-0.3.3' 2018-02-21 11:53:50 -05:00