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
33,840 Commits 53 Branches 631 Tags
71b8b7ee2ddfa5e2f8d6bf8f754276f512b5fd1c
Commit Graph
33840 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 1e9488f2fd Extract expressions in construct_ntor_key_map() 
No behavioral change here: this is just refactoring.
 2019-09-18 11:12:43 -04:00
Nick Mathewson 82ad63ef40 changes file for 31338 2019-09-18 10:28:33 -04:00
Nick Mathewson 1c67d261d5 practracker: Integration test for --list-overbroad 
Make sure that we list overbroad exceptions, and nothing else
 2019-09-18 10:28:33 -04:00
Nick Mathewson d1ffac3f8a practracker: An exception is "used" even when it is violated. 
The purpose of tracking whether an exception is used is so that we
can tell whether it is overbroad.  This means that an _underbroad_
exception is still a used one.  Fixes bug 31338.
 2019-09-18 10:28:33 -04:00
Nick Mathewson 25d55fa01e Practracker: do not list problems when told to --list-overbroad. 2019-09-18 10:28:33 -04:00
Nick Mathewson d6d3e829dd Merge branch 'maint-0.4.1' 2019-09-18 08:07:56 -04:00
Nick Mathewson 70bcff6010 Merge branch 'bug31772_041' into maint-0.4.1 2019-09-18 08:07:50 -04:00
Nick Mathewson 7225cfc586 Merge branch 'maint-0.4.1' 2019-09-17 21:28:38 -04:00
Nick Mathewson 5f00c03ed0 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-09-17 21:28:38 -04:00
Nick Mathewson 9e674d0eb4 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-09-17 21:28:37 -04:00
Nick Mathewson 02840169d8 Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5 2019-09-17 21:28:29 -04:00
Nick Mathewson 2013e63acc Merge branch 'maint-0.4.1' 2019-09-17 21:26:32 -04:00
Nick Mathewson c3e94a8ccd Merge branch 'maint-0.4.0' into maint-0.4.1 2019-09-17 21:26:32 -04:00
Nick Mathewson a1f97bb253 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-09-17 21:26:31 -04:00
Nick Mathewson 50b45c43eb Merge branch 'maint-0.2.9' into maint-0.3.5 2019-09-17 21:26:31 -04:00
Nick Mathewson 967460389a Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9 2019-09-17 21:26:17 -04:00
Nick Mathewson 25af8ada30 Correct the syntax description for the MAPADDRESS command. 
In 0.4.1.1-alpha I introduced a bug where we would require and
ignore a single positional argument.

Fixes bug 31772.
 2019-09-17 19:26:45 -04:00
Nick Mathewson 93def2bb4f Merge branch 'maint-0.4.1' 
"ours" to avoid version bump.
 2019-09-17 19:12:08 -04:00
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 tor-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
Daniel Pinto 619178bb3a Fix add_c_file.py script to support paths starting with ./ #31336 2019-09-16 22:57:20 +01: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