Nick Mathewson
0adcfbc7c8
Move address_set to src/or
...
This is temporary, until src/or is split.
Putting this in containers would be another logical alternative,
except that addresses depend on containers, and we don't like
cycles.
2018-07-05 14:51:07 -04:00
Nick Mathewson
24c0f83185
Move socks5_status.h to src/lib/net
...
There might be a better place for it in the long run, but this is
the best I can think of for now.
2018-07-05 14:48:29 -04:00
Nick Mathewson
0e4b1781f4
Move handles.h to src/lib/container
...
There might be a better place for it in the long run, but this is
the best we can think of for now.
2018-07-05 14:45:34 -04:00
Nick Mathewson
df98582851
Merge remote-tracking branch 'github/ticket26626'
2018-07-03 12:52:43 -04:00
Nick Mathewson
77e678c20d
Merge remote-tracking branch 'github/shrink_or_h_more'
2018-07-03 11:09:54 -04:00
Nick Mathewson
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
Nick Mathewson
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
Nick Mathewson
9568c0ce3d
Return U64_PRINTF_ARG and U64_FORMAT
...
The standard is printf("%"PRIu64, x);
2018-07-03 10:40:59 -04:00
Nick Mathewson
52884f56d4
Replace U64_LITERAL with the standard UINT64_C
2018-07-03 10:33:50 -04:00
Nick Mathewson
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
Nick Mathewson
228d25ddf6
Merge branch 'maint-0.3.4'
2018-07-03 09:48:03 -04:00
Nick Mathewson
d38e474950
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-03 09:48:03 -04:00
Nick Mathewson
4c094436c5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-03 09:48:03 -04:00
Nick Mathewson
a4e8f94507
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-03 09:48:03 -04:00
Nick Mathewson
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
Nick Mathewson
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
Nick Mathewson
bfcfeaed07
Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4
2018-07-02 13:22:07 -04:00
Nick Mathewson
6c440da926
Remove system headers from or.h
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
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
43dc92441d
Tabify all of the .am files.
2018-07-01 09:37:28 -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
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
a3ec89a4f8
Merge branch 'maint-0.2.9' into maint-0.3.1
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
Nick Mathewson
7a47379f25
Merge branch 'maint-0.3.4'
2018-06-29 13:06:16 -04:00
Nick Mathewson
f82f8179e6
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-29 13:06:15 -04:00
Nick Mathewson
f6b30a97a9
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-06-29 13:06:15 -04:00
Nick Mathewson
68dfbd5ef4
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-29 13:06:15 -04:00
Nick Mathewson
b89a66e997
Merge remote-tracking branch 'ahf-github/maint-0.3.0' into maint-0.3.1
2018-06-29 13:06:11 -04:00
Nick Mathewson
419077c26d
Merge remote-tracking branch 'ahf-github/maint-0.3.1' into maint-0.3.1
2018-06-29 13:06:08 -04:00
Nick Mathewson
1a5be3c5e7
Merge branch 'maint-0.3.4'
2018-06-29 13:03:00 -04:00
Nick Mathewson
5ab23e03fa
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-06-29 13:02:56 -04:00
Nick Mathewson
df896ed632
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-29 13:00:56 -04:00
Nick Mathewson
fe2588a5a8
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-29 13:00:56 -04:00
Nick Mathewson
1385a5118d
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-29 13:00:56 -04:00
Nick Mathewson
6ac64e16ed
Eliminate compat.h
2018-06-29 12:21:52 -04:00
Nick Mathewson