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 |
|
Nick Mathewson
|
7a47379f25
|
Merge branch 'maint-0.3.4'
|
2018-06-29 13:06:16 -04:00 |
|
Nick Mathewson
|
ea14d3408d
|
Merge branch 'maint-0.2.9' into maint-0.3.1
|
2018-06-29 13:06:15 -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
|
890bc15ab6
|
Changes file for 26467
|
2018-06-29 13:04:29 -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
|
b426e83f07
|
Merge remote-tracking branch 'ahf-github/maint-0.2.9' into maint-0.2.9
|
2018-06-29 13:00:52 -04:00 |
|
Nick Mathewson
|
9d5b815dca
|
Add a missing include to timers, to make windows happier
|
2018-06-29 12:59:43 -04:00 |
|
Nick Mathewson
|
6ac64e16ed
|
Eliminate compat.h
|
2018-06-29 12:21:52 -04:00 |
|
Nick Mathewson
|
077176a34c
|
Stop using util.h and compat.h in src/trunnel/
|
2018-06-29 12:21:52 -04:00 |
|
Nick Mathewson
|
666e3e5ec6
|
Stop using util.h and compat.h in src/tools
|
2018-06-29 12:21:52 -04:00 |
|
Nick Mathewson
|
4212a135e1
|
Remove util.h and compat.h includes from src/common
|
2018-06-29 12:21:52 -04:00 |
|
Nick Mathewson
|
35e1c497aa
|
Combine compat.h into util.h
This is now just a collection of frequently-used headers.
|
2018-06-29 12:21:52 -04:00 |
|
Nick Mathewson
|
714788b195
|
Remove non-windows system includes from compat.h and util.h
|
2018-06-29 12:21:52 -04:00 |
|
Nick Mathewson
|
71e56c70e9
|
Remove windows libraries from util.h and compat.h
|
2018-06-29 12:21:52 -04:00 |
|
Nick Mathewson
|
31897a256c
|
Extract socks5_status_t
I'm not sure of the best place to put this header long-term, since
both or/*.c and tools/tor-resolve.c use it.
|
2018-06-29 12:21:52 -04:00 |
|