nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
33,563 Commits 53 Branches 630 Tags 128 MiB
06367299c2
Commit Graph

33563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson
a3342b382a Bump version to 0.4.1.6 2019-09-17 19:11:56 -04:00
Nick Mathewson
48afec91ce Merge branch 'maint-0.4.1' 2019-09-17 19:05:13 -04:00
Nick Mathewson
c6f7943269 Merge branch 'bug31570_041' into maint-0.4.1 2019-09-17 19:04:25 -04:00
Nick Mathewson
48b2815879 Merge branch 'maint-0.4.1' 2019-09-17 18:58:44 -04:00
Nick Mathewson
50f981719f Merge branch 'maint-0.4.0' into maint-0.4.1 2019-09-17 18:58:44 -04:00
Nick Mathewson
ef35435584 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-09-17 18:58:43 -04:00
Nick Mathewson
dc41e6a80c Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5 2019-09-17 18:58:06 -04:00
Nick Mathewson
2ebe1fcd52 Merge branch 'maint-0.2.9' into maint-0.3.5 
"ours" merge to avoid picking up 0.2.9 version of ticket 31673.
 2019-09-17 18:57:49 -04:00
Nick Mathewson
dcd6462605 Merge branch 'maint-0.4.1' 2019-09-17 18:56:52 -04:00
Nick Mathewson
cec42be570 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-09-17 18:56:52 -04:00
Nick Mathewson
88cf964ca3 Merge branch 'maint-0.4.1' 2019-09-17 18:55:18 -04:00
Nick Mathewson
ab74c3560a Merge branch 'ticket31552_041' into maint-0.4.1 2019-09-17 18:54:05 -04:00
Nick Mathewson
2d744de355 Correct a comment in channel_tls_process_cell. 2019-09-17 11:42:19 -04:00
Nick Mathewson
7f5c6a603c Move PROCESS_CELL macros outside of channel_tls_process_cell(). 
These macros are used in multiple functions, and as such really
don't belong within a single function.

Also #undef them once we are done with them.

This change makes practracker pass again.
 2019-09-17 11:40:14 -04:00
Nick Mathewson
75d3c08219 bump to 0.4.2.1-alpha-dev 2019-09-17 11:36:43 -04:00
Nick Mathewson
4d7ce27105 Merge branch 'bug31107_041' into bug31107_master 2019-09-17 09:16:53 -04:00
Nick Mathewson
6ee19e57c2 Merge branch 'bug31107_040' into bug31107_041 2019-09-17 09:16:52 -04:00
Nick Mathewson
da8ba5010b Merge branch 'bug31107_035' into bug31107_040 2019-09-17 09:16:52 -04:00
Nick Mathewson
7589995111 Merge branch 'maint-0.3.5' into bug31107_035 2019-09-17 09:16:52 -04:00
Nick Mathewson
3c97ab3c24 Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN. 
We previously used tor_fragile_assert() to declare that this case
could not happen: VERSIONS cells are always supposed to be
variable-sized, right?

This is incorrect, though.  On a v1 link protocol connection, all
cells are fixed-sized.  There aren't supposed to be any VERSIONS
cells with this version of the protocol, but apparently, somebody
was messing up.  (The v1 link protocol is obsolete, so probably the
implementer responsible didn't mean to be using it.)

Fixes bug 31107.  Bugfix on 0.2.4.4-alpha, when we introduced a
tor_fragile_assert() for this case.
 2019-09-17 09:13:25 -04:00
Nick Mathewson
b5f39955d1 pick a release date for 0.4.2.1-alpha 2019-09-17 08:19:28 -04:00
Nick Mathewson
9bbddbcb21 Run format_changelog again 2019-09-17 08:00:47 -04:00
Nick Mathewson
1f0848e0b6 Fold new entries into 0.4.2.1-alpha changelog 2019-09-17 08:00:24 -04:00
George Kadianakis
585eaa123f Merge branch 'tor-github/pr/1323' 2019-09-17 14:51:43 +03:00
Nick Mathewson
a28a682a1f bump version to 0.4.2.1-alpha 2019-09-16 16:24:24 -04:00
Nick Mathewson
68a0106bf3 Run "make autostyle" and fix wide lines. 2019-09-16 13:27:42 -04:00
Nick Mathewson
7cd68b04de Fold one more entry into changelog. 2019-09-16 12:50:56 -04:00
George Kadianakis
8f2ab45229 Merge branch 'tor-github/pr/1313' 2019-09-16 19:45:20 +03:00
George Kadianakis
9877423736 Merge branch 'tor-github/pr/1312' 2019-09-16 19:44:33 +03:00
George Kadianakis
8377b610bd Merge branch 'tor-github/pr/1327' 2019-09-16 19:43:44 +03:00
Nick Mathewson
8ad419744f On windows, allow failures in test_parseconf.sh 
There seems to be some unreliability issue with this test on
appveyor.

Addresses ticket 31757; This isn't a final fix for this issue, but
it should make CI pass.
 2019-09-16 11:01:03 -04:00
Nick Mathewson
f6ea890241 Fix various grammar/style/type issues in 0.4.2.1-alpha changelog 
Fixes by seborn.
 2019-09-16 10:25:21 -04:00
Nick Mathewson
a1694b7363 Fix a shellcheck warning in test_parseconf.sh. 
I wonder why this didn't show up before.
 2019-09-16 09:22:43 -04:00
Nick Mathewson
f281c3637a hand-edits to 0.4.2.1-alpha changelog 2019-09-16 09:18:20 -04:00
Nick Mathewson
804260828b sort and coalesce some changelog sections 2019-09-16 08:40:21 -04:00
Nick Mathewson
1f4a7a4bb1 Run format-changelog, add a stub blurb. 2019-09-16 08:33:10 -04:00
Nick Mathewson
cbd3b01863 Start a changelog for 0.4.2.1-alpha 
This commit sorts the changes files using sortChanges, and inserts
them into a changelog entry.
 2019-09-16 08:32:01 -04:00
George Kadianakis
cd72850e08 Merge branch 'tor-github/pr/1316' 2019-09-16 15:22:18 +03:00
George Kadianakis
5ec751b38b Merge branch 'tor-github/pr/1324' 2019-09-16 15:21:28 +03:00
George Kadianakis
a1192b6b4a Merge branch 'tor-github/pr/1273' 2019-09-16 15:20:25 +03:00
George Kadianakis
bdd17da9fd Merge branch 'tor-github/pr/1318' 2019-09-16 15:19:38 +03:00
Nick Mathewson
11cf4d9c3a test_parseconf.sh: On --dump-config failure, --verify-config 2019-09-14 19:00:41 -04:00
Nick Mathewson
7e9ee3a58d Add a test with many non-default options. 2019-09-14 19:00:41 -04:00
Nick Mathewson
617679df42 Add a few error test cases 2019-09-14 19:00:41 -04:00
Nick Mathewson
80e858e3e6 Add an integration test for %include. 2019-09-14 19:00:41 -04:00
Nick Mathewson
28025698a1 test_parseconf: run each test from inside its directory. 
We need this to test includes and relative paths.
 2019-09-14 19:00:41 -04:00
Nick Mathewson
98ab3817a8 Add a changes file for ticket 31637. 2019-09-14 19:00:41 -04:00
Nick Mathewson
850a00dc07 Add test for +Option, /Option, and Option 
Here we use these directives to replace, extend, or clear values in
torrc.defaults and in torrc.
 2019-09-14 19:00:41 -04:00
Nick Mathewson
2f7be9620b Move our first 3 example conf_examples to named directories 
I'm not planning to use "example" as the name for all of them, but
these first three _are_ simple examples.
 2019-09-14 19:00:41 -04:00
Nick Mathewson
7c7e8402b5 Add a test script to try parsing and encoding Tor configurations 
This script takes a set of example torrcs and command-lines from
src/test/conf_examples.  If a success is expected, it runs "tor
--dump-config" and compares the result with the one we expect.  If a
failure is expected, it runs "tor --verify-config" and greps for the
error we expect.
 2019-09-14 19:00:41 -04:00