2878dad9db
Merge branch 'maint-0.3.4'
2018-07-03 13:31:26 -04:00
32d9d69350
Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4
2018-07-03 13:16:37 -04:00
df98582851
Merge remote-tracking branch 'github/ticket26626'
2018-07-03 12:52:43 -04:00
fe8f774820
Merge branch 'bug26522'
2018-07-03 11:34:36 -04:00
d0525c38d6
Refrain from potentially insecure usage of strncat()
2018-07-03 11:34:14 -04:00
77e678c20d
Merge remote-tracking branch 'github/shrink_or_h_more'
2018-07-03 11:09:54 -04:00
02a4442524
Fix up some windows compilation issues.
...
These were mostly cases where our previous macros had been casting,
and the values that we were trying to printf were not in fact
uint64_t.
2018-07-03 11:00:18 -04:00
d5a3bb960d
Retire U64_TO_DBL and DBL_TO_U64
...
These were necessary long ago to work around a bug in VC6.
2018-07-03 10:45:43 -04:00
9568c0ce3d
Return U64_PRINTF_ARG and U64_FORMAT
...
The standard is printf("%"PRIu64, x);
2018-07-03 10:40:59 -04:00
52884f56d4
Replace U64_LITERAL with the standard UINT64_C
2018-07-03 10:33:50 -04:00
cf0b07c2e5
Retire some unused (or nearly unused) macros.
2018-07-03 10:31:19 -04:00
4638be5312
Use the standard SHRT_MAX name.
2018-07-03 10:28:10 -04:00
c75215c23a
Clean up various things that broke with our stdint.h changes
...
Casting before printf was necessary; now it's not so smart.
We don't have SIZEOF_UINT8_T any more.
2018-07-03 10:26:06 -04:00
e2a94dc481
Require stdint.h and inttypes.h
...
We've been silently requiring stdint.h for a while now, and nobody
has complained. Closes ticket 26626.
2018-07-03 10:25:31 -04:00
a01b4d7f87
Merge remote-tracking branch 'rl1987/ticket26527'
2018-07-03 09:53:46 -04:00
d38e474950
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-03 09:48:03 -04:00
228d25ddf6
Merge branch 'maint-0.3.4'
2018-07-03 09:48:03 -04:00
4c094436c5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-03 09:48:03 -04:00
a4e8f94507
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-03 09:48:03 -04:00
fedb3e46ec
Remove ATTR_NONNULL macro
2018-07-03 12:33:09 +03:00
dfdf32404c
Partially revert "Use tor_addr_from_getsockname() in several places"
...
This reverts part of commit 6ed384b827
2018-07-02 16:11:02 -04:00
3baf3d01cb
hs_ntor_ref.py: pass only strings to subprocess.Popen
...
Recent Python3 versions seem to require this on Windows.
Fixes bug 26535; bug copied from ntor_ref.py on 0.3.1.1-alpha.
2018-07-02 14:23:26 -04:00
fc5f8b6931
ntor_ref.py: pass only strings to subprocess.Popen
...
Recent Python3 versions seem to require this on Windows.
Fixes bug 26535; bug introduced in f4be34f70d
2018-07-02 14:18:41 -04:00
bfcfeaed07
Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4
2018-07-02 13:22:07 -04:00
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
cb1a3674eb
File-level documentation for some of src/lib.
2018-07-01 20:22:55 -04:00
83a4946e7b
Prune the .may_include files a bit; detect unused lines in them
2018-07-01 18:14:28 -04:00
518ebe14dc
fixup! Extract or_options_t from or.h
2018-07-01 16:02:33 -04:00
8d562c040f
fixup! Remove system headers from or.h
2018-07-01 15:31:18 -04:00
6c440da926
Remove system headers from or.h
2018-07-01 15:20:37 -04:00
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
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
f75357ec35
Pull a couple more enums from or.h
2018-07-01 15:20:37 -04:00
6ccd98f93e
Move ext_or_cmd_t to proto_ext_or
2018-07-01 15:20:37 -04:00
49f88e77e5
Extract more constants from or.h
2018-07-01 15:20:37 -04:00
f54a5cbfb6
Extract addr_policy_t into a new header.
2018-07-01 15:20:37 -04:00
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
1743dac078
Minimize headers that include crypto_formats and x25519 stuff
2018-07-01 15:20:37 -04:00
500826479a
Remove other needless includes include from or/*.h
2018-07-01 15:20:37 -04:00
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
7a61a92870
Combine DH_BYTES and DH_KEY_LEN; put them in a lib/defs header.
2018-07-01 11:25:29 -04:00
cf8c3abff1
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-01 10:22:21 -04:00
adcd1d8b9a
Merge branch 'maint-0.3.4'
2018-07-01 10:22:21 -04:00
9aeef05f8f
Merge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3
2018-07-01 10:22:18 -04:00
43dc92441d
Tabify all of the .am files.
2018-07-01 09:37:28 -04:00
028523c801
Merge branch 'maint-0.3.4'
2018-06-30 09:15:39 -04:00
e042727cf0
Merge remote-tracking branch 'catalyst-github/bug25895_034-squashed' into maint-0.3.4
2018-06-30 09:15:34 -04:00
57155d38a3
Merge branch 'maint-0.3.4'
2018-06-29 23:12:03 -04:00
8093a63f95
Restor EOL@EOF in routerlist.c
2018-06-29 23:08:45 -04:00
ce940c8c09
Add another winsock2 include, for timeval in procmon.
2018-06-29 19:17:24 -04:00
Nick Mathewson
rl1987