Nick Mathewson
0aec613a78
Add an --enable-pic option for people who hack Tor into libraries
...
Closes ticket 23846
2018-09-12 10:10:29 -04:00
cypherpunks
ab91302fd0
nodelist: use strcmpstart() instead of strncmp()
...
in rend_parse_v2_service_descriptor.
Fix on c58675ca72
2018-09-12 14:03:06 +00:00
Nick Mathewson
19dbc385d5
Merge remote-tracking branch 'tor-github/pr/298'
2018-09-12 09:38:52 -04:00
Nick Mathewson
62743912bc
Merge branch 'pr278_squashed'
2018-09-12 09:06:35 -04:00
rl1987
7b27d98eae
Actually, just disable test_rebind.sh on Appveyor
2018-09-12 09:06:16 -04:00
rl1987
d30e47fd4e
Disable test_rebind.sh on Windows
2018-09-12 09:06:16 -04:00
rl1987
5a11670fca
Update/fix CI build
...
Update integration test to Python 3
2018-09-12 09:06:16 -04:00
rl1987
4811869d7a
Pick random ports in test_rebind.py
2018-09-12 09:06:16 -04:00
rl1987
d8157097b4
Always include socket rebinding code
2018-09-12 09:06:16 -04:00
rl1987
3f34fc921c
Tweak test_rebind.py for future-proofness
2018-09-12 09:06:16 -04:00
rl1987
762c27b907
Integration test for socket rebinding
...
squash! Integration test for socket rebinding
2018-09-12 09:06:16 -04:00
rl1987
fbd50f5994
Avoid mentioning ticket number in comments
2018-09-12 09:06:16 -04:00
rl1987
9f5431c79f
Comments/explanation for #17873
2018-09-12 09:06:16 -04:00
rl1987
74a474a2e7
Minor code cleanups
2018-09-12 09:06:16 -04:00
rl1987
c9c16ee8a4
Add changes file
2018-09-12 09:06:16 -04:00
rl1987
27c868eff1
Log a notice *after* creating connection
2018-09-12 09:06:16 -04:00
rl1987
d548453abd
Log a notice when changing to/from wildcard IP address
2018-09-12 09:06:14 -04:00
rl1987
9f7ed1d04e
Always close old listeners in retry_all_listeners
2018-09-12 09:05:39 -04:00
rl1987
f04e0bd5d6
Refrain from compiling socket rebinding code on system that don't need it
2018-09-12 09:05:39 -04:00
rl1987
c99bb8b6ea
Try rebinding new listener after closing old one if first bind failed with EADDRINUSE
2018-09-12 09:05:36 -04:00
Nick Mathewson
73a37d1e54
Check waitpid return value and exit status in tinytest.c
...
It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit. Notably, this happens on a
leak sanitizer failure.
Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.
2018-09-12 08:57:18 -04:00
Mahrud Sayrafi
be142194cd
Encode Circuit ID as src IP in Proxy Protocol for Opportunistic Onions
2018-09-12 15:20:26 +03:00
Nick Mathewson
0dbd4fe309
Merge branch 'maint-0.3.4'
2018-09-12 08:17:45 -04:00
Nick Mathewson
73ba308d3d
Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4
2018-09-12 08:17:42 -04:00
Nick Mathewson
8294c40c96
Merge remote-tracking branch 'tor-github/pr/318'
2018-09-12 08:12:19 -04:00
cypherpunks
03c4d0ab9c
rust/protover: fix check for overlapping ranges
...
Closes ticket 27649. Bugfix on e6625113c9
2018-09-12 02:47:59 +00:00
cypherpunks
b88a2f28ae
rust/protover: remove version zero from tests
...
This isn't legal according to dir-spec.txt.
We can write separate tests for it if the spec
is changed to make it legal.
2018-09-12 02:47:59 +00:00
cypherpunks
e9ef7d5ab4
test/protover: remove version zero from tests
...
This isn't legal according to dir-spec.txt.
We can write separate tests for it if the spec
is changed to make it legal.
2018-09-12 02:47:29 +00:00
Nick Mathewson
5a2374b074
Merge remote-tracking branch 'tor-github/pr/315'
2018-09-11 15:55:30 -04:00
Nick Mathewson
affbe376f9
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-11 15:53:06 -04:00
Nick Mathewson
902b34a0de
Merge branch 'maint-0.3.4'
2018-09-11 15:53:06 -04:00
Mike Perry
ae1aea4cc4
Bug 25505: Check circuitmux queues before padding.
2018-09-11 15:53:03 -04:00
David Goulet
9c83cd1993
Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2
2018-09-11 15:36:48 -04:00
Nick Mathewson
2d0a6d7691
Merge remote-tracking branch 'mikeperry/bug25505'
2018-09-11 14:32:39 -04:00
Nick Mathewson
7852499812
Merge remote-tracking branch 'tor-github/pr/312'
2018-09-11 14:05:16 -04:00
Nick Mathewson
75ad1a1f2f
Merge remote-tracking branch 'onionk/doublevote1'
2018-09-11 13:16:49 -04:00
Nick Mathewson
5a8827a4c9
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-11 13:09:21 -04:00
Nick Mathewson
89c5b8d7dc
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-11 13:09:21 -04:00
Nick Mathewson
1d8957129b
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-11 13:09:21 -04:00
Nick Mathewson
042a9fd8b0
Merge branch 'maint-0.3.4'
2018-09-11 13:09:21 -04:00
Nick Mathewson
46bccc50e5
Merge remote-tracking branch 'teor/ticket27252-034' into maint-0.3.4
2018-09-11 13:09:18 -04:00
Nick Mathewson
8e714d2a02
Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3
2018-09-11 13:09:09 -04:00
Nick Mathewson
c3a750486c
Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2
2018-09-11 13:09:04 -04:00
Nick Mathewson
198b6354e6
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
2018-09-11 13:08:57 -04:00
Nick Mathewson
328bcbf305
Merge remote-tracking branch 'tor-github/pr/313'
2018-09-11 12:23:21 -04:00
Nick Mathewson
a7d0cbd462
Merge remote-tracking branch 'tor-github/pr/314'
2018-09-11 12:19:13 -04:00
Nick Mathewson
8a873a5695
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-11 12:04:56 -04:00
Nick Mathewson
8afc100cb5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-11 12:04:56 -04:00
Nick Mathewson
f741505642
Merge branch 'maint-0.3.4'
2018-09-11 12:04:56 -04:00
Nick Mathewson
3119cb5062
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-11 12:04:55 -04:00
