Nick Mathewson
e4e949e901
fix a changes file warning
2018-06-20 10:20:44 -04:00
Nick Mathewson
8846f128ff
Changes file for full_include_paths
2018-06-20 09:36:28 -04:00
Nick Mathewson
d7301a456a
Merge remote-tracking branch 'neel/b25886c'
2018-06-20 08:32:34 -04:00
Nick Mathewson
e9c93a3415
Merge branch 'maint-0.3.4'
2018-06-20 08:29:52 -04:00
Nick Mathewson
0a6f4627a4
eol@eof in test-dir.c
2018-06-20 08:29:38 -04:00
Nick Mathewson
11a76b903b
Merge branch 'maint-0.3.4'
2018-06-20 08:05:07 -04:00
Nick Mathewson
7b9cd5cca5
Merge branch 'asn_bug24977_final_squashed' into maint-0.3.4
2018-06-20 08:02:27 -04:00
George Kadianakis
1f1a57b8d0
Add changes file for #24977 .
2018-06-20 08:01:02 -04:00
Nick Mathewson
5acbcf150e
Merge branch 'maint-0.3.4'
2018-06-20 07:53:22 -04:00
rl1987
ce9b9cc18d
Add changes file
2018-06-20 07:49:41 -04:00
Nick Mathewson
152e4a1e50
Merge branch 'maint-0.3.4'
2018-06-20 07:35:17 -04:00
Taylor Yu
bfd36177c4
Fix compilation of Rust crypto doctests
...
The doctests for src/rust/crypto don't compile for multiple reasons,
including some missing exports and incorrect identifier paths. Fixes
bug 26415; bugfix on 0.3.4.1-alpha.
2018-06-19 13:53:26 -05:00
Nick Mathewson
f3267741e4
Merge branch 'maint-0.3.4'
2018-06-18 17:09:03 -04:00
Nick Mathewson
d27745d81d
Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a
...
This was already added to LIBTOR_A_SOURCES; it doesn't need to get
added again.
Fixes bug 26402. Bugfix on 0.3.4.1-alpha.
2018-06-18 17:07:27 -04:00
Nick Mathewson
5879909826
Revert "Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a"
...
This reverts commit 70d91bd059
.
2018-06-18 17:06:18 -04:00
Nick Mathewson
70d91bd059
Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a
...
This was already added to LIBTOR_A_SOURCES; it doesn't need to get
added again.
Fixes bug 26402. Bugfix on 0.3.4.1-alpha.
2018-06-18 17:03:52 -04:00
Nick Mathewson
104c2e9e7e
Merge branch 'split_or_h'
2018-06-18 14:18:34 -04:00
Nick Mathewson
ac64e00794
Changes file for "make clippy"
2018-06-18 11:30:06 -04:00
Nick Mathewson
16dd2f7bb0
Merge remote-tracking branch 'rl1987/bug25477'
2018-06-17 20:25:40 -04:00
Nick Mathewson
5746e210b8
Merge remote-tracking branch 'rl1987/feature8323_squashed2'
2018-06-17 20:20:15 -04:00
Nick Mathewson
d5e4b6983f
Merge remote-tracking branch 'rl1987/bug26282'
2018-06-17 19:32:08 -04:00
Nick Mathewson
987174cc6f
Merge remote-tracking branch 'github/bug26152_035'
2018-06-17 19:28:59 -04:00
Neel Chauhan
9d7f148885
Make frac_nodes_with_descriptors() take and use for_direct_connect
2018-06-16 11:27:28 -04:00
Nick Mathewson
3dd94a7ea7
Changes file for rust fatal warnings
2018-06-16 10:20:21 -04:00
Nick Mathewson
3edc48c07b
Add a changes file for splitting structures out of or.h
2018-06-15 15:48:03 -04:00
Nick Mathewson
945d871da5
Merge branch 'maint-0.3.3'
2018-06-14 12:50:26 -04:00
Nick Mathewson
71065201dd
Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3
2018-06-14 12:47:09 -04:00
Nick Mathewson
ca6d289c00
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-13 09:59:28 -04:00
Nick Mathewson
7cc3cdef22
Merge branch 'maint-0.3.3'
2018-06-13 09:59:28 -04:00
Nick Mathewson
7e7585d0a1
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-13 09:59:28 -04:00
Nick Mathewson
9713ecfc40
Fix an extra space in a changes file
2018-06-13 09:59:26 -04:00
Nick Mathewson
049ba66746
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-13 09:58:05 -04:00
Nick Mathewson
286d02995f
Merge branch 'maint-0.3.3'
2018-06-13 09:58:05 -04:00
Nick Mathewson
6017447e3a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-13 09:58:04 -04:00
Nick Mathewson
94f3007627
Merge branch 'bug26158_031' into maint-0.3.1
2018-06-13 09:58:01 -04:00
Nick Mathewson
1c80eb92fa
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-13 09:57:10 -04:00
Nick Mathewson
76e9de7c6d
Merge branch 'maint-0.3.3'
2018-06-13 09:57:10 -04:00
Nick Mathewson
ff70cc84f8
Merge branch 'bug25686_diagnostic_032' into maint-0.3.2
2018-06-13 09:56:17 -04:00
Nick Mathewson
8c8ed91aae
Merge remote-tracking branch 'rl1987/bug24891'
2018-06-13 09:46:50 -04:00
Nick Mathewson
bc951e83aa
Fold in changelog entry.
2018-06-12 09:47:07 -04:00
Nick Mathewson
16381b579e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-12 09:44:17 -04:00
Nick Mathewson
53513e4bfe
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-12 09:44:17 -04:00
Nick Mathewson
eaa359650c
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-12 09:44:17 -04:00
Nick Mathewson
03f3ee6d74
Merge branch 'maint-0.3.3'
2018-06-12 09:44:17 -04:00
Linus Nordberg
2ef448da2f
Add a changelog entry.
2018-06-12 09:44:01 -04:00
Nick Mathewson
73aae608d5
Remove folded-in changes files
2018-06-12 08:56:28 -04:00
Nick Mathewson
6230dfaf14
Merge branch 'maint-0.3.3'
2018-06-12 08:18:57 -04:00
Nick Mathewson
5d8a927aa3
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-12 08:18:56 -04:00
Nick Mathewson
7fff99110b
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-12 08:18:56 -04:00
Nick Mathewson
d84581a3e6
Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1
2018-06-12 08:18:53 -04:00