b6c50c6259
Merge branch 'maint-0.3.4'
2018-07-12 14:32:16 -04:00
e0f33c1d3e
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-12 14:32:16 -04:00
710188f84e
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-12 14:32:16 -04:00
98ee23ca1e
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-12 14:32:16 -04:00
cd4795ca3e
put new bridge auth Serge into place
...
The "Bifroest" bridge authority has been retired; the new bridge authority
is "Serge", and it is operated by George from the TorBSD project.
Closes ticket 26771.
2018-07-12 14:12:13 -04:00
0317eb143e
Remove a redundant typedef in proto_ext_or.h
2018-07-12 11:02:22 -04:00
4ac87a430f
Remove a redundant typedef in addr_policy_st.h
2018-07-12 10:35:29 -04:00
a7ec493d88
Merge remote-tracking branch 'imnotbad/bug26663'
2018-07-12 08:59:23 -04:00
5aee26ee46
Move all use cases of micro-revision.i to a single place
...
That place is git-revision.c; git-revision.c now lives in lib/log.
Also fix the compilation rules so that all object files that need
micro-revision.i depend on it.
2018-07-11 09:52:39 -04:00
537092cdbb
Merge branch 'ticket26223'
2018-07-10 20:18:28 -04:00
c90961a923
Document compat_getdelim_.
2018-07-10 20:18:20 -04:00
391ef5e42c
Explain why we use raw_free with getdelim result.
2018-07-10 20:16:37 -04:00
b6d0e7caa4
Rename tm_cvt to time_to_tm
2018-07-10 15:25:53 -04:00
e7f5f48d68
Rename torlog.[ch] to log.[ch]
...
Fun fact: these files used to be called log.[ch] until we ran into
conflicts with systems having a log.h file. But now that we always
include "lib/log/log.h", we should be fine.
2018-07-10 15:20:30 -04:00
41640b6573
Rename util_malloc to malloc.
2018-07-10 15:16:57 -04:00
6711a172c0
Merge remote-tracking branch 'neel/fbsd-cfix'
2018-07-10 14:50:49 -04:00
a2c44a7a7e
Isolate resolve.h usage in the modules that really need it.
...
(Almost none of Tor should actually need to touch the platform resolver.)
2018-07-10 13:36:45 -04:00
8de48c111c
Remove addr_port_lookup.
...
This lets us cut the dependency from address.c to resolve.c: the
address.c module now has no paths to the libc resolver in it.
2018-07-10 13:32:37 -04:00
2f657a1416
Remove all users of addr_port_lookup outside of address.c
...
This function has a nasty API, since whether or not it invokes the
resolver depends on whether one of its arguments is NULL. That's a
good way for accidents to happen.
This patch incidentally makes tor-resolve support socks hosts on
IPv6.
2018-07-10 13:23:37 -04:00
c2ddb7b231
Move tor_addr_{,port_}lookup to resolve.c
2018-07-10 13:00:02 -04:00
5d8336c182
Refactor ipv[46].[ch]
...
These are now combined into an inaddr.[ch], since their purpose is
to implement functions for struct in_addr and struct in6_addr.
The definitions for in6_addr and its allies are now in a separate
header, inaddr_st.h.
Closes ticket 26532.
2018-07-10 12:50:38 -04:00
6d58c20d94
Fix build on FreeBSD post-refactor
2018-07-10 12:32:14 -04:00
ef106ce788
Document the headers in src/app/config/
2018-07-10 12:28:31 -04:00
4f42c923d6
File-level summary documentation for src/lib/*/*.[ch]
2018-07-10 12:22:01 -04:00
951d59d706
Use tor_getline() in dirserv.c to remove its upper line limit.
...
Closes ticket 26223.
2018-07-10 10:36:49 -04:00
6574d4bd27
Refactor dirserv_read_measured_bandwidths to have a single exit point
2018-07-10 10:36:49 -04:00
b04d719c10
Integrate getdelim() and getline() support into Tor.
2018-07-10 10:36:49 -04:00
1604c0fe0e
Add the compatibility definition for getdelim.c from netbsd.
...
We shouldn't actually need this code nearly anywhere we build:
getdelim is POSIX, and mingw provides it.
2018-07-10 10:14:24 -04:00
5ce348c4c7
Bump to 0.3.4.4-rc-dev
2018-07-09 15:17:38 -04:00
f5e3bcb60b
Bump to 0.3.3.8-dev.
2018-07-09 15:17:16 -04:00
19f2057d49
Fix some lingering windows compilation issues from Jenkins.
...
These were caused by the recent refactoring.
2018-07-09 12:54:40 -04:00
eb856a3e51
strcasecmp should not take a size_t argument
2018-07-09 11:17:23 -04:00
98dff5df3f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-09 10:17:20 -04:00
250e0fc1c4
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-09 10:17:20 -04:00
1b81c4b5f3
Merge branch 'maint-0.3.4'
2018-07-09 10:17:20 -04:00
6ad2c2b92f
Merge remote-tracking branch 'github/bug26269_031' into maint-0.3.2
2018-07-09 10:17:17 -04:00
e7463be39b
Merge branch 'maint-0.3.4'
2018-07-09 10:16:51 -04:00
83de46eb25
Changes file and comment for 25928.
2018-07-09 10:16:48 -04:00
529faef28e
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-09 10:15:16 -04:00
69918629f5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-09 10:14:43 -04:00
4a604d9938
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-09 10:14:43 -04:00
8b53dfc362
Merge branch 'bug26269_029' into maint-0.2.9
2018-07-09 10:14:39 -04:00
7746b071d8
Merge remote-tracking branch 'gsomlo/gls-single-da'
2018-07-09 09:59:46 -04:00
a1a55a33c2
Merge branch 'bug26488'
2018-07-09 09:37:14 -04:00
46998fc8fd
Validate that DirAuthority address is IPv4
2018-07-09 09:37:09 -04:00
03283c00d8
Merge remote-tracking branch 'rl1987/bug26525'
2018-07-09 09:31:12 -04:00
532873a924
Bump to 0.3.3.8
2018-07-09 09:24:07 -04:00
9320100d6e
Bump to 0.3.3.4-rc
2018-07-09 09:23:39 -04:00
a95cfb8a58
Clear all control.c flags on control_free_all()
...
Fixes bug 25512.
(Cherry-picked from 3519d0c808
2018-07-09 09:20:45 -04:00
8e3a52e5c3
Merge branch 'maint-0.3.4'
2018-07-09 09:14:41 -04:00
Nick Mathewson
Roger Dingledine
Neel Chauhan
rl1987