Nick Mathewson
cd2be4283c
Merge remote-tracking branch 'catalyst-github/bug26449_034' into maint-0.3.4
2018-07-02 13:38:40 -04:00
Nick Mathewson
2e5eb02928
Merge branch 'maint-0.3.4'
2018-07-02 13:22:14 -04:00
Nick Mathewson
bfcfeaed07
Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4
2018-07-02 13:22:07 -04:00
Nick Mathewson
d6aa6549b5
Merge remote-tracking branch 'catalyst-github/moar-libs'
2018-07-02 12:22:37 -04:00
Nick Mathewson
d88ce331ef
Merge branch 'bug26594'
2018-07-02 12:11:16 -04:00
Nick Mathewson
c8ccd028a7
Don't redefine str(n)casecmp on windows unless they're missing
...
When we do redefine them, use inline functions instead of #define.
This fixes a latent code problem in our redefinition of these
functions, which was exposed by our refactoring: Previously, we
would #define strcasecmp after string.h was included, so nothing bad
would happen. But when we refactored, we would sometimes #define it
first, which was a problem on mingw, whose headers contain
(approximately):
inline int strcasecmp (const char *a, const char *b)
{ return _stricmp(a,b); }
Our define turned this into:
inline int _stricmp(const char *a, const char *b)
{ return _stricmp(a,b); }
And GCC would correctly infer that this function would loop forever,
rather than actually comparing anything. This caused bug 26594.
Fixes bug 26594; bug not in any released version of Tor.
2018-07-02 11:50:17 -04:00
Nick Mathewson
cb1a3674eb
File-level documentation for some of src/lib.
2018-07-01 20:22:55 -04:00
Nick Mathewson
83a4946e7b
Prune the .may_include files a bit; detect unused lines in them
2018-07-01 18:14:28 -04:00
Nick Mathewson
518ebe14dc
fixup! Extract or_options_t from or.h
2018-07-01 16:02:33 -04:00
Nick Mathewson
8d562c040f
fixup! Remove system headers from or.h
2018-07-01 15:31:18 -04:00
Nick Mathewson
6c440da926
Remove system headers from or.h
2018-07-01 15:20:37 -04:00
Nick Mathewson
13116378b1
Extract or_options_t from or.h
...
I decided to have this file included from config.h, though, since it
is used nearly everywhere.
2018-07-01 15:20:37 -04:00
Nick Mathewson
986d761510
Extract or_state_t to its own header.
...
Fewer modules needed this than I had expected.
2018-07-01 15:20:37 -04:00
Nick Mathewson
f75357ec35
Pull a couple more enums from or.h
2018-07-01 15:20:37 -04:00
Nick Mathewson
6ccd98f93e
Move ext_or_cmd_t to proto_ext_or
2018-07-01 15:20:37 -04:00
Nick Mathewson
49f88e77e5
Extract more constants from or.h
2018-07-01 15:20:37 -04:00
Nick Mathewson
f54a5cbfb6
Extract addr_policy_t into a new header.
2018-07-01 15:20:37 -04:00
Nick Mathewson
6da0311d2c
Extract various enums and tiny structs from or.h
...
These all have a logical header to go in.
2018-07-01 15:20:37 -04:00
Nick Mathewson
1743dac078
Minimize headers that include crypto_formats and x25519 stuff
2018-07-01 15:20:37 -04:00
Nick Mathewson
500826479a
Remove other needless includes include from or/*.h
2018-07-01 15:20:37 -04:00
Nick Mathewson
471104eaa5
Remove needless includes from or.h
...
or.h should really include only the minimum of stuff from or/*,
common/*, and lib/*.
2018-07-01 15:20:37 -04:00
Nick Mathewson
7a61a92870
Combine DH_BYTES and DH_KEY_LEN; put them in a lib/defs header.
2018-07-01 11:25:29 -04:00
Nick Mathewson
cf8c3abff1
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-01 10:22:21 -04:00
Nick Mathewson
adcd1d8b9a
Merge branch 'maint-0.3.4'
2018-07-01 10:22:21 -04:00
Nick Mathewson
9aeef05f8f
Merge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3
2018-07-01 10:22:18 -04:00
Nick Mathewson
c03958dbc1
Update the coverage script to look at new file locations
2018-07-01 10:18:48 -04:00
Nick Mathewson
7b1832d011
Add make targets to show static libraries.
...
These might make it easier for people to link our stuff, and keep
their scripts more robust.
2018-07-01 10:08:54 -04:00
Nick Mathewson
43dc92441d
Tabify all of the .am files.
2018-07-01 09:37:28 -04:00
Nick Mathewson
028523c801
Merge branch 'maint-0.3.4'
2018-06-30 09:15:39 -04:00
Nick Mathewson
e042727cf0
Merge remote-tracking branch 'catalyst-github/bug25895_034-squashed' into maint-0.3.4
2018-06-30 09:15:34 -04:00
Nick Mathewson
3c97b148a4
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-29 23:12:03 -04:00
Nick Mathewson
72ee0b6f79
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-29 23:12:03 -04:00
Nick Mathewson
57155d38a3
Merge branch 'maint-0.3.4'
2018-06-29 23:12:03 -04:00
Nick Mathewson
3808e3015a
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-06-29 23:12:03 -04:00
Nick Mathewson
2968c716d7
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-29 23:11:47 -04:00
Nick Mathewson
1953a7e61d
Finally remove our EOL@EOF check.
...
This check was added by mistake long ago. It will be nice to see
these EOLs disappear from our code over time.
(backport from master)
2018-06-29 23:11:02 -04:00
Nick Mathewson
8093a63f95
Restor EOL@EOF in routerlist.c
2018-06-29 23:08:45 -04:00
Nick Mathewson
ce940c8c09
Add another winsock2 include, for timeval in procmon.
2018-06-29 19:17:24 -04:00
Nick Mathewson
5921b23e15
add an include to fix macos, and probably bsd too
2018-06-29 14:03:13 -04:00
Nick Mathewson
ed84dab8b4
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-29 13:49:43 -04:00
Nick Mathewson
36c372581f
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-29 13:49:43 -04:00
Nick Mathewson
a3ec89a4f8
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-29 13:49:43 -04:00
Nick Mathewson
75a6e7e256
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-06-29 13:49:43 -04:00
Nick Mathewson
cd3f957219
Merge branch 'maint-0.3.4'
2018-06-29 13:49:43 -04:00
Nick Mathewson
3c0a63c40f
Fix a memory error in test_shared_random
...
Bug not in any released Tor.
2018-06-29 13:49:02 -04:00
Nick Mathewson
d583459d58
Fix some memory errors in the recent coverity fixes.
...
Found by asan on travis :/
2018-06-29 13:48:36 -04:00
Nick Mathewson
92b4996b23
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-29 13:07:13 -04:00
Nick Mathewson
d3ecb3a8d6
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-06-29 13:07:13 -04:00
Nick Mathewson
1f389dadd0
Merge branch 'maint-0.3.4'
2018-06-29 13:07:13 -04:00
Nick Mathewson
6e9d5fc4ec
Merge remote-tracking branch 'ahf-github/maint-0.3.2' into maint-0.3.2
2018-06-29 13:07:07 -04:00
