Nick Mathewson
b915b6cd21
Merge remote-tracking branch 'github/prop297'
2018-12-11 09:44:57 -05:00
Nick Mathewson
27e4269929
Merge branch 'maint-0.3.5'
2018-12-11 09:41:05 -05:00
Nick Mathewson
e1273d7d1b
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-11 09:41:05 -05:00
Nick Mathewson
6506b1ee9f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-11 09:41:05 -05:00
Nick Mathewson
c1f9191581
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-11 09:41:04 -05:00
Nick Mathewson
ce501a529f
Merge remote-tracking branch 'catalyst-github/ticket27402'
2018-12-11 09:37:41 -05:00
teor
4991b29311
Fallbacks: Update the hard-coded fallback list in December 2018
...
Merge Phoul's two lists into teor's list.
Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in
January 2018 (of which ~115 were still functional), with a list of
157 fallbacks (92 new, 65 existing, 85 removed) generated in
December 2018.
Closes ticket 24803.
2018-12-10 17:02:19 +10:00
teor
78e177d622
Fallbacks: Update the hard-coded fallback list in December 2018
...
Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in
January 2018 (of which ~115 were still functional), with a list of
148 fallbacks (89 new, 59 existing, 91 removed) generated in
December 2018.
Closes ticket 24803.
2018-12-07 16:43:10 +10:00
Nick Mathewson
2ccb9e9444
Merge branch 'maint-0.3.5'
2018-12-06 09:26:34 -05:00
Nick Mathewson
c1f86f7492
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-06 09:26:33 -05:00
Nick Mathewson
c4f7953d8b
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-06 09:26:32 -05:00
Nick Mathewson
00341d97f3
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-06 09:26:32 -05:00
Karsten Loesing
57798eb1cb
Update geoip and geoip6 to the December 5 2018 database.
2018-12-05 21:02:39 +01:00
Nick Mathewson
46a321fbdd
Merge branch 'maint-0.3.5'
2018-12-05 10:25:12 -05:00
Nick Mathewson
967efc0d28
Merge remote-tracking branch 'tor-github/pr/546' into maint-0.3.5
2018-12-05 10:23:28 -05:00
Nick Mathewson
1eb3719a62
Merge remote-tracking branch 'public/prop298'
2018-12-05 09:43:03 -05:00
Nick Mathewson
1f95e80351
Merge branch 'prop293_squashed'
2018-12-05 09:24:51 -05:00
Nick Mathewson
a2f81b644b
Write tests for mark_my_descriptor_dirty_if_too_old()
2018-12-05 09:24:45 -05:00
Nick Mathewson
00509aaafa
Merge remote-tracking branch 'tor-github/pr/553'
2018-12-05 08:28:54 -05:00
Nick Mathewson
ca4b86f90a
Merge remote-tracking branch 'tor-github/pr/508'
2018-12-05 08:19:02 -05:00
Nick Mathewson
c01507a5fe
remember why we are doing getsockopt()
2018-12-05 08:14:21 -05:00
Nick Mathewson
31a6d9f499
Add tests for parsing each routerstatus flag.
2018-12-03 13:40:08 -05:00
Nick Mathewson
92af8e5113
Add a framework for testing set_routerstatus_from_routerinfo().
...
Additionally, use it to test that is_staledesc is set correctly.
Eventually we'll want to test all the other flags, but I'm aiming
for only adding coverage on the changed code here.
2018-12-03 13:22:23 -05:00
Nick Mathewson
417a324a85
Make input argument const in set_routerstatus_from_routerinfo.
2018-12-03 12:34:29 -05:00
Nick Mathewson
32213fa9ad
Keep list of dirauth flags in sync between dirvote.c and fuzz_vrs.c
...
Suggested by Teor on PR
2018-12-03 12:18:45 -05:00
rl1987
db9ab3754a
Print error message we get from socket.connect_ex when it fails
2018-12-03 14:49:33 +02:00
rl1987
25f3b82445
More logging for #28229
2018-12-03 14:40:37 +02:00
rl1987
9369152aae
Check that new listener connection is actually listening
2018-12-03 14:28:32 +02:00
Nick Mathewson
0d9dc13e08
Merge remote-tracking branch 'tor-github/pr/544'
2018-12-02 19:50:04 -05:00
Nick Mathewson
8221b5d587
Merge remote-tracking branch 'tor-github/pr/559'
2018-12-02 19:38:40 -05:00
teor
612b21b8ea
comment: replace cached-routers with cached-descriptors
...
cached-routers has been gone for a long time
2018-12-03 10:19:34 +10:00
Nick Mathewson
0015d00842
Use tor_strdup() in place of malloc+strncpy+terminate.
2018-12-01 20:46:06 -05:00
Nick Mathewson
8accf71c44
Merge remote-tracking branch 'tor-github/pr/556'
2018-12-01 20:35:38 -05:00
Nick Mathewson
2b2b97484a
Merge branch 'ticket27490a_squashed'
2018-12-01 20:32:18 -05:00
Neel Chauhan
ad031b64ce
Add regression test for ClientAutoIPv6ORPort
2018-12-01 14:55:57 -05:00
Neel Chauhan
81f2828d67
In fascist_firewall_use_ipv6(), say we can use IPv6 if ClientAutoIPv6ORPort is 1
2018-12-01 14:55:57 -05:00
Neel Chauhan
822cb93cab
Add new option ClientAutoIPv6ORPort to switch between IPv4 and IPv6 OR ports
2018-12-01 14:55:57 -05:00
rl1987
353d2a091d
Fix coverage build
2018-12-01 14:31:17 -05:00
rl1987
39e158db36
tor-resolve: Rework SOCKS5 response parsing with trunnel
2018-12-01 14:31:17 -05:00
rl1987
8b9d6581f6
tor-resolve: Rework SOCKS5 method negotiation client part with trunnel
2018-12-01 14:31:17 -05:00
rl1987
1051969a1d
tor-resolve: parse SOCKS4a reply
2018-12-01 14:31:17 -05:00
rl1987
d49baa77b5
Allow socks4_server_reply version to be 0 (for tor-resolve)
2018-12-01 14:31:17 -05:00
rl1987
83af6d6149
tor-resolve: Use trunnel code for SOCKS5 request generation
2018-12-01 14:31:17 -05:00
rl1987
30582b940e
tor-resolve: link tor-resolve binary with trunnel lib
2018-12-01 14:31:17 -05:00
rl1987
a2bb172225
tor-resolve: generate SOCKS4a request with trunnel
2018-12-01 14:31:17 -05:00
Nick Mathewson
701eaef980
Move net.inet.ip.random_id code to lib/net/
2018-12-01 11:36:03 -05:00
Nick Mathewson
d4d4a4b2dd
Merge remote-tracking branch 'tor-github/pr/527'
2018-12-01 11:30:53 -05:00
Nick Mathewson
51d94cea33
Merge branch 'maint-0.3.5'
2018-12-01 11:26:55 -05:00
Nick Mathewson
1a97379e5e
Merge remote-tracking branch 'tor-github/pr/554' into maint-0.3.5
2018-12-01 11:26:52 -05:00
Nick Mathewson
7e9985b75a
Merge remote-tracking branch 'tor-github/pr/536'
2018-12-01 11:24:02 -05:00
