a23c36ebcd
Merge branch 'maint-0.3.4'
2018-10-10 11:34:49 -04:00
e5fe8b0e3a
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-10 11:34:49 -04:00
b057623bed
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-10-10 11:34:48 -04:00
119df9c1c0
Update geoip and geoip6 to the October 9 2018 database.
2018-10-10 17:26:41 +02:00
da86a70bd8
Merge remote-tracking branch 'tor-github/pr/384'
2018-10-10 09:24:48 -04:00
7409aa58d1
Merge remote-tracking branch 'tor-github/pr/385'
2018-10-09 12:46:46 -04:00
361eaa9931
Merge remote-tracking branch 'public/ticket27856'
2018-10-09 09:04:53 -04:00
fb1d37f34f
Add changes file
2018-10-07 18:28:04 +03:00
3cc089ce59
Add newline between hs_client_get_random_intro_from_edge() and hs_client_receive_introduce_ack()
2018-10-05 19:54:26 -04:00
9d886185c1
Make sure we're removing conn from old_conns *once*
2018-10-03 15:51:59 +03:00
2b146bdb9a
Refrain from using SMARTLIST_DEL_CURRENT in retry_all_listeners
2018-10-03 15:31:49 +03:00
43211c3a0c
Merge remote-tracking branch 'public/bug27893'
2018-10-01 12:12:33 -05:00
58299b2927
Merge remote-tracking branch 'public/bug27728'
2018-10-01 12:06:39 -05:00
c4e29001c4
Fix a bug where we would crash on --version.
...
Bug not in any released Tor.
test-stem would have caught this.
2018-10-01 12:01:51 -05:00
b058f64cc0
Detect an unlikely integer overflow.
2018-09-27 16:30:02 -04:00
9e65e7a36f
Merge branch 'split_stats'
2018-09-27 16:26:06 -04:00
09223ad83b
Merge branch 'ticket_27861'
2018-09-27 16:24:47 -04:00
9e1a3be064
Prevent duplicate initialization of NSS DH module
...
Allowing this didn't do any actual harm, since there aren't any
shared structures or leakable objects here. Still, it's bad style
and might cause trouble in the future.
Closes ticket 27856.
2018-09-27 13:26:47 -04:00
d0b2b5a202
Always initialize the periodic events list.
...
Various places in our code try to activate these events or check
their status, so we should make sure they're initialized as early as
possible. Fixes bug 27861; bugfix on 0.3.5.1-alpha.
2018-09-27 13:24:36 -04:00
8812f562a0
Fix a memory leak in --dump-config
...
When freeing a configuration object from confparse.c in
dump_config(), we need to call the appropriate higher-level free
function (like or_options_free()) and not just config_free().
This only happens with options (since they're the one where
options_validate allocates extra stuff) and only when running
--dump-config with something other than minimal (since
OPTIONS_DUMP_MINIMAL doesn't hit this code).
Fixes bug 27893; bugfix on 0.3.2.1-alpha.
2018-09-27 13:05:19 -04:00
316453065d
Mark a variable static.
2018-09-27 11:59:39 -04:00
34402ece8c
geoip: fix windows compilation
2018-09-27 11:02:58 -04:00
013a123833
Changes file for splitting stats
2018-09-27 10:30:17 -04:00
c8f2a6d2fe
Extract the non-stats part of geoip into a new src/lib/geoip.
2018-09-27 10:26:01 -04:00
fa32574bdb
Remove excess dependencies from geoip.c
2018-09-27 10:15:39 -04:00
f403af2207
Split geoip from geoip-related stats.
...
This commit just moves the code to two separate files. The geoip
code still has a few needless dependencies on core/* and features/*.
2018-09-27 09:36:52 -04:00
79208ee852
Move the n_v3_ns_requests field out of geoip_country_t
...
This is preparation for splitting geoip.c into stats and non-stats
portions.
2018-09-27 09:04:08 -04:00
241c1505cc
Move the predicted ports code out of rephist.c
...
It differs from the rest of the rephist code in that it's actually
necessary for Tor to operate, so it should probably go somewhere
else. I'm not sure where yet, so I'll leave it in the same
directory, but give it its own file.
2018-09-27 08:21:17 -04:00
de0b07c634
Merge branch 'router_split'
2018-09-26 09:47:59 -04:00
5e5e019b31
Merge remote-tracking branch 'dgoulet/bug27550_035_01'
2018-09-26 08:36:09 -04:00
3a643078c1
Changes file for splitting router.c
2018-09-25 18:54:17 -04:00
5fe05de4fe
Remove extra includes from router.c
2018-09-25 18:33:13 -04:00
4f0bc0c8f5
Revise things that had included router.h before
...
Make them only include the headers that they needed, and sort their
headers while we're at it.
2018-09-25 17:57:58 -04:00
3ff58e47d2
Move the "is the network disabled?" functions out of router.c
...
Since this is completely core functionality, I'm putting it in
core/mainloop, even though it depends on feature/hibernate. We'll
have to sort that out in the future.
2018-09-25 17:22:14 -04:00
b8df2318e9
Move routerinfo_t functions out of router.c
...
(It turns out that some of the functions in router.h didn't even
exist any more, so I just got to delete their declarations completely.)
2018-09-25 16:48:00 -04:00
efa978124f
Extract nickname-checking functions from router.c
2018-09-25 16:22:11 -04:00
5c86f3c297
Move the various _describe() functions out of router.c
...
Note that I haven't separated the headers yet (there's still an
2018-09-25 16:13:47 -04:00
fcd0f76134
Extract all the "am I a server" functions from router.c
2018-09-25 16:00:50 -04:00
70539e3d5e
Move all authdir_mode_*() functions into authmode.h
2018-09-25 15:39:24 -04:00
9385b7ec5f
Rename dirauth/mode.h to dirauth/authmode.h
...
This is preparation for having a routermode.h as well
2018-09-25 15:18:21 -04:00
8a350e088b
Move self-test functionality into its own file.
2018-09-25 15:14:57 -04:00
934859cf80
Move key-loading and crosscert-checking out of feature/relay
...
This is also used by onion services, so it needs to go in another
module.
2018-09-25 15:14:57 -04:00
c82163dff4
Fix reference to socks-extensions.txt in tor-resolve manpage
2018-09-25 12:39:27 +03:00
6b90972dc6
Merge branch 'pr_339_squashed'
2018-09-24 11:25:39 -04:00
d49133d9ca
Mention that we require Python 2.7 or newer
2018-09-24 11:25:33 -04:00
9767cf8cc0
Merge branch 'bug26913_033'
2018-09-24 11:17:09 -04:00
6c739c3fb2
Fix arm compilation with openssl <1.1
...
Bug 27781; bugfix on 0.3.5.1-alpha.
2018-09-24 11:11:29 -04:00
112e5fa7ec
Merge branch 'maint-0.3.4'
2018-09-24 11:10:56 -04:00
f57d8722e0
Fix the 0.3.4 part of bug 27781 (arm compilation)
...
Because with arm on OpenSSL <1.1 we don't define USE_EVP_AES_CTR, we
need to include crypto_util.h here.
2018-09-24 11:08:27 -04:00
78295904f7
Merge branch 'ticket26744'
2018-09-24 10:56:50 -04:00
Nick Mathewson
Karsten Loesing
rl1987
Neel Chauhan