8b3ec74e5f
Merge remote-tracking branch 'public/bug27990'
2018-10-16 08:02:01 -04:00
4983322cc7
Merge branch 'maint-0.3.4'
2018-10-15 10:37:53 -04:00
fd528a0884
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-15 10:37:52 -04:00
dff7d3d00a
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-10-15 10:37:49 -04:00
b113399658
Merge branch 'bug27709_029' into maint-0.2.9
2018-10-15 10:34:39 -04:00
2c5c17510a
Merge remote-tracking branch 'tor-github/pr/402'
2018-10-14 15:20:39 -04:00
36ba506508
report origin of mystery core file
...
Report what program produced the mysterious core file that we
occasionally see on Travis CI during make distcheck. Closes ticket
28024.
2018-10-12 15:55:15 -05:00
67351f6724
Merge remote-tracking branch 'tor-github/pr/380'
2018-10-12 11:39:37 -04:00
717507e3bb
Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9
2018-10-10 17:12:11 -04:00
bfab1dda2b
Merge branch 'bug27738-034-merged' into bug27738-master-merged
2018-10-10 15:17:47 -05:00
484b259604
Merge branch 'bug27738-033' into bug27738-034
2018-10-10 15:13:02 -05:00
cc10873dee
Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033
2018-10-10 15:01:59 -05:00
50ad2545cc
Merge branch 'maint-0.3.4'
2018-10-10 14:27:27 -04:00
48182c147b
Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4
2018-10-10 14:27:24 -04:00
a23c36ebcd
Merge branch 'maint-0.3.4'
2018-10-10 11:34:49 -04:00
e5fe8b0e3a
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-10 11:34:49 -04:00
b057623bed
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-10-10 11:34:48 -04:00
119df9c1c0
Update geoip and geoip6 to the October 9 2018 database.
2018-10-10 17:26:41 +02:00
d3d6c59557
Add sys/time.h include back to procmon.c
2018-10-10 11:26:38 -04:00
c6b5b43d92
fixup! Changes file for apveyor changes
2018-10-10 11:10:29 -04:00
8c0009a8de
Changes file for apveyor changes
2018-10-10 10:22:08 -04:00
fb1d37f34f
Add changes file
2018-10-07 18:28:04 +03:00
43211c3a0c
Merge remote-tracking branch 'public/bug27893'
2018-10-01 12:12:33 -05:00
58299b2927
Merge remote-tracking branch 'public/bug27728'
2018-10-01 12:06:39 -05:00
a1504f138d
changes file for splitting routerparse.c ( #27924 )
2018-10-01 11:45:11 -05:00
9e65e7a36f
Merge branch 'split_stats'
2018-09-27 16:26:06 -04:00
d0b2b5a202
Always initialize the periodic events list.
...
Various places in our code try to activate these events or check
their status, so we should make sure they're initialized as early as
possible. Fixes bug 27861; bugfix on 0.3.5.1-alpha.
2018-09-27 13:24:36 -04:00
8812f562a0
Fix a memory leak in --dump-config
...
When freeing a configuration object from confparse.c in
dump_config(), we need to call the appropriate higher-level free
function (like or_options_free()) and not just config_free().
This only happens with options (since they're the one where
options_validate allocates extra stuff) and only when running
--dump-config with something other than minimal (since
OPTIONS_DUMP_MINIMAL doesn't hit this code).
Fixes bug 27893; bugfix on 0.3.2.1-alpha.
2018-09-27 13:05:19 -04:00
013a123833
Changes file for splitting stats
2018-09-27 10:30:17 -04:00
de0b07c634
Merge branch 'router_split'
2018-09-26 09:47:59 -04:00
5e5e019b31
Merge remote-tracking branch 'dgoulet/bug27550_035_01'
2018-09-26 08:36:09 -04:00
3a643078c1
Changes file for splitting router.c
2018-09-25 18:54:17 -04:00
c82163dff4
Fix reference to socks-extensions.txt in tor-resolve manpage
2018-09-25 12:39:27 +03:00
6b90972dc6
Merge branch 'pr_339_squashed'
2018-09-24 11:25:39 -04:00
d49133d9ca
Mention that we require Python 2.7 or newer
2018-09-24 11:25:33 -04:00
9767cf8cc0
Merge branch 'bug26913_033'
2018-09-24 11:17:09 -04:00
112e5fa7ec
Merge branch 'maint-0.3.4'
2018-09-24 11:10:56 -04:00
f57d8722e0
Fix the 0.3.4 part of bug 27781 (arm compilation)
...
Because with arm on OpenSSL <1.1 we don't define USE_EVP_AES_CTR, we
need to include crypto_util.h here.
2018-09-24 11:08:27 -04:00
78295904f7
Merge branch 'ticket26744'
2018-09-24 10:56:50 -04:00
169f238c23
Merge remote-tracking branch 'onionk/protover-rust1'
2018-09-21 16:28:32 -04:00
5c0dd1aa90
move protover_rust.c to core/or/
...
Missed in 667a6e8fe9
2018-09-21 20:14:53 +00:00
63e08f56b8
Merge remote-tracking branch 'tor-github/pr/365'
2018-09-21 16:13:59 -04:00
b7bd162af7
Merge remote-tracking branch 'dgoulet/ticket27774_035_03'
2018-09-21 13:02:12 -04:00
194acfb51d
Split directory.c code into several modules
...
Parts of this C file naturally belong in dircache, dirclient, and
dircommon: so, move them there.
2018-09-21 12:57:22 -04:00
0e4c42a912
Merge remote-tracking branch 'ahf-github/asn/bugs4700_2'
2018-09-21 09:40:16 -04:00
36be6f0d2d
fixup! hs-v3: Silence some logging for client authorization
2018-09-21 09:39:21 -04:00
a1b0283040
Changes file for #26747
2018-09-21 09:38:51 -04:00
9b0a17a74f
Merge branch 'maint-0.3.4'
2018-09-21 09:36:31 -04:00
e818a71905
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-21 09:35:54 -04:00
2cadd93cea
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-21 09:35:51 -04:00
Nick Mathewson
Taylor Yu
Karsten Loesing
rl1987
cypherpunks
David Goulet