Nick Mathewson
fcfa22d80a
Merge branch 'maint-0.3.3'
2018-05-16 12:11:46 -04:00
Nick Mathewson
4a5c1584fe
update tor-rust-dependencies submodule
2018-05-16 09:16:47 -04:00
Nick Mathewson
1442e818b6
Merge remote-tracking branch 'isis-github/bug26106'
2018-05-16 09:16:04 -04:00
Nick Mathewson
e5974e5158
Merge remote-tracking branch 'isis-github/bug26108'
2018-05-16 09:14:13 -04:00
Nick Mathewson
2d2cfbcd81
Merge remote-tracking branch 'isis-github/bug26109'
2018-05-16 09:13:27 -04:00
Nick Mathewson
7f37ba825f
reflow the blurb.
2018-05-16 09:06:43 -04:00
Nick Mathewson
d194f2130d
move a changelog entry and try writing a blurb
2018-05-16 09:05:47 -04:00
Nick Mathewson
ff01471ce7
fix some changelog typos that Catalyst found.
2018-05-15 19:40:46 -04:00
Isis Lovecruft
4d349c6a61
rust: Update rand_core dependency to 0.2.0-pre.0.
2018-05-15 19:33:20 +00:00
Isis Lovecruft
760cf8e28f
rust: Update rand dev-dependency to 0.5.0-pre.2.
2018-05-15 19:31:29 +00:00
Nick Mathewson
72e1f19249
various changelog edits
2018-05-15 15:06:43 -04:00
Isis Lovecruft
4c21d41407
rust: Export digests subcrate from our crypto crate.
2018-05-15 18:05:52 +00:00
Isis Lovecruft
d9c877a6e5
rust: Export crypto_rand::* functions from our external crate.
2018-05-15 18:03:18 +00:00
Isis Lovecruft
9988882c63
rust: Move rand crate into crypto parent crate.
2018-05-15 17:48:57 +00:00
Isis Lovecruft
2ac849da36
rust: Make Rng::new() methods public.
2018-05-15 17:45:09 +00:00
Nick Mathewson
c0eaaf403b
run format-changelog
2018-05-15 12:34:12 -04:00
Nick Mathewson
e811bac837
use sortChanges to begin an 0.3.4.1-alpha changelog
2018-05-15 12:31:16 -04:00
Nick Mathewson
98aff146d3
Merge branch 'maint-0.3.3'
2018-05-15 09:32:45 -04:00
Nick Mathewson
6acbd4c112
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-15 09:32:44 -04:00
Nick Mathewson
4aa3d511b2
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-15 09:32:44 -04:00
Nick Mathewson
502d2c0062
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-15 09:32:44 -04:00
Karsten Loesing
033e4723f3
Update geoip and geoip6 to the May 1 2018 database.
2018-05-15 15:20:09 +02:00
Nick Mathewson
db94d7fed2
Update cov-diff to handle new gcov, and remove timestamps
...
The new gcov sometimes emits *s if there is a line containing
multiple basic blocks, and some are not executed. (The gcov
documentation says something weird about this point, so I'm trying
to interpret it into the compilerese that I'm familiar with.)
That's bug 26101.
Also, when we're looking for unique variations in our coverage, we
would like cov-diff to suppress timestamps on the diffs. That's bug
26102.
Both of these are bugfixes on 0.2.5.1-alpha when the cov-diff script
was introduced.
My apologies for the perl.
2018-05-14 18:04:10 -04:00
Nick Mathewson
5eb2d58880
Add a missing return after marking a stream for bad connected cell
...
Fixes bug 26072; bugfix on 0.2.4.7-alpha.
2018-05-14 15:54:48 -04:00
Nick Mathewson
a394a2dd86
Merge branch 'bug25903_v5_squashed'
2018-05-14 14:25:07 -04:00
Mike Perry
fd504587d5
Bug 25903: Tests
2018-05-14 14:24:58 -04:00
Nick Mathewson
a9ef335c1b
Use router_get_my_routerinfo_with_err to implement the old version
...
Having one function implemented in terms of the other should keep
them from diverging.
follow-up on #25852
2018-05-14 14:12:36 -04:00
Nick Mathewson
d27fd7ff6b
Merge remote-tracking branch 'rl1987/bug25852_take2'
2018-05-14 14:05:50 -04:00
Nick Mathewson
aab626405c
Merge remote-tracking branch 'catalyst-github/bug25756'
2018-05-11 18:15:43 -04:00
Nick Mathewson
b3e591dca1
improve a URL
2018-05-11 18:00:30 -04:00
Nick Mathewson
cbb13df808
Merge branch 'contributing'
2018-05-11 17:59:09 -04:00
Nick Mathewson
f6c96fd0ca
Merge remote-tracking branch 'public/bug25994'
2018-05-11 17:57:59 -04:00
Roger Dingledine
962c2f8776
get rid of whitespace before #ifdef's
...
i don't know if whitespace is ok to have before preprocessing
directives on all platforms, but anyway we almost never have it,
so now things are more uniform.
2018-05-11 16:27:55 -04:00
Nick Mathewson
f7949a440f
Add a CONTRIBUTING file
...
This file contains pointers to other important top-level resources,
and some info about acceptable licenses. Also, add that info to
CodingStandards.md
2018-05-11 13:19:37 -04:00
David Goulet
51f65c185e
control: Mask the event(s) before using ANY_EVENT_IS_INTERESTING()
...
Before this commit, the control events were never triggered. It was introduced
with commit 0c19ce7bdeFixes #26082
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-05-11 08:58:11 -04:00
Nick Mathewson
9800f4769f
Merge remote-tracking branch 'asn-github/bug26078'
2018-05-11 08:20:49 -04:00
George Kadianakis
efe8f17a4d
Properly ignore retval of event_del().
...
Fixes #26078 : CID 1435546.
2018-05-11 15:17:52 +03:00
Nick Mathewson
d50d07fce5
changes file for 25943 and 25944
2018-05-11 08:16:02 -04:00
Nick Mathewson
3799f3116b
Merge remote-tracking branch 'saper-github/x509_cert_free_crash'
2018-05-11 08:09:26 -04:00
Marcin Cieślak
308eec7532
testing: X509 certificate structure needs to be initialized
...
We alloc/free X.509 structures in three ways:
1) X509 structure allocated with X509_new() and X509_free()
2) Fake X509 structure allocated with fake_x509_malloc() and fake_x509_free()
May contain valid pointers inside.
3) Empty X509 structure shell allocated with tor_malloc_zero() and
freed with tor_free()
2018-05-11 01:44:09 +00:00
Nick Mathewson
75e5b778e1
Merge remote-tracking branch 'public/bug25981'
2018-05-10 19:31:11 -04:00
rl1987
036df13a03
Tweak error handling for #25852
2018-05-10 16:45:57 +03:00
rl1987
8ad97b7dcf
Avoid confusion with errno from libc
2018-05-10 16:33:08 +03:00
Nick Mathewson
b343ba9060
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-10 09:22:32 -04:00
Nick Mathewson
7ee67c47fa
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-10 09:22:32 -04:00
Nick Mathewson
382beb93cb
Merge branch 'maint-0.3.3'
2018-05-10 09:22:32 -04:00
Nick Mathewson
2d61a83513
Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1
2018-05-10 09:22:14 -04:00
Nick Mathewson
f64fa6b19e
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-10 09:19:28 -04:00
Nick Mathewson
15b8c860d3
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-10 09:19:28 -04:00
Nick Mathewson
2eff709edb
Merge branch 'maint-0.3.3'
2018-05-10 09:19:28 -04:00
