Nick Mathewson
f5092e711f
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-08 08:24:47 -04:00
Nick Mathewson
3cace828a9
Merge branch 'bug22644_029' into maint-0.2.9
2017-09-08 08:24:36 -04:00
Nick Mathewson
a9d4df9a08
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-07 15:18:01 -04:00
Nick Mathewson
08592c95fa
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-07 15:18:00 -04:00
Nick Mathewson
bcf2b413c3
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-09-07 15:18:00 -04:00
Karsten Loesing
09618ffe38
Update geoip and geoip6 to the September 6 2017 database.
2017-09-07 21:06:16 +02:00
Nick Mathewson
12dad5ebf7
Fix crashes on empty +HSPOST and +POSTDESCRIPTOR commands
...
Fixes bug 22644; bugfix on 0.2.7.1-alpha and 0.2.0.1-alpha
respectively.
2017-09-07 09:20:00 -04:00
Nick Mathewson
b548371f76
Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0
2017-08-03 09:12:23 -04:00
Nick Mathewson
9696021593
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-08-03 08:44:31 -04:00
Nick Mathewson
93b28972c1
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-08-03 08:44:31 -04:00
Nick Mathewson
f33c96610f
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-03 08:44:31 -04:00
Karsten Loesing
1280de42a4
Update geoip and geoip6 to the August 3 2017 database.
2017-08-03 10:00:54 +02:00
David Goulet
ff9c529667
hs: Cleanup logging statement in hs_intropoint.c
...
One log statement was a warning and has been forgotten. It is triggered for a
successful attempt at introducting from a client.
It has been reported here:
https://lists.torproject.org/pipermail/tor-relays/2017-August/012689.html
Three other log_warn() statement changed to protocol warning because they are
errors that basically can come from the network and thus triggered by anyone.
Fixes #23078 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-08-01 14:15:47 -04:00
Nick Mathewson
58e1c6dd86
Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9
2017-08-01 11:30:29 -04:00
Nick Mathewson
8500f0e4e1
Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9
2017-08-01 11:28:36 -04:00
Nick Mathewson
84c4a2bc3f
Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0
2017-08-01 11:24:02 -04:00
Nick Mathewson
7c68b2f1a5
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:23:00 -04:00
Nick Mathewson
2b94b0ea72
Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9
2017-08-01 11:22:42 -04:00
Nick Mathewson
1d48712c28
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:21:19 -04:00
Nick Mathewson
f6ecda8400
Merge remote-tracking branch 'public/bug18100_029' into maint-0.2.9
2017-08-01 11:21:14 -04:00
Nick Mathewson
9d24a352c0
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:19:30 -04:00
Nick Mathewson
0e7558ab64
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-08-01 11:19:29 -04:00
Nick Mathewson
925ef048a9
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-08-01 11:19:29 -04:00
Nick Mathewson
a48ae2aa67
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-08-01 11:19:29 -04:00
Nick Mathewson
6862eada65
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-08-01 11:19:29 -04:00
Nick Mathewson
0bfd1c318c
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-08-01 11:19:28 -04:00
Nick Mathewson
6199e27a2b
Merge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4
2017-08-01 11:19:24 -04:00
Nick Mathewson
ad35e595e5
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-27 08:23:36 -04:00
Nick Mathewson
24ddf5862e
Merge remote-tracking branch 'public/bug20247_029' into maint-0.2.9
2017-07-27 08:23:34 -04:00
Nick Mathewson
cc4c1840a6
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-26 15:37:06 -04:00
Nick Mathewson
dcc477cb53
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-07-26 15:35:17 -04:00
Nick Mathewson
fbf93614c9
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-07-26 15:35:07 -04:00
Nick Mathewson
c362c6a852
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-07-26 15:35:01 -04:00
Nick Mathewson
0ad5a6b034
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-07-26 15:34:56 -04:00
Nick Mathewson
09618bc488
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-07-26 15:34:40 -04:00
Nick Mathewson
18734d3b25
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-26 12:58:22 -04:00
Nick Mathewson
32b9edeb91
Fix build warnings from Coverity related to our BUG macro
...
In the Linux kernel, the BUG() macro causes an instant panic. Our
BUG() macro is different, however: it generates a nonfatal assertion
failure, and is usable as an expression.
Additionally, this patch tells util_bug.h to make all assertion
failures into fatal conditions when we're building with a static
analysis tool, so that the analysis tool can look for instances
where they're reachable.
Fixes bug 23030.
2017-07-26 12:57:49 -04:00
Nick Mathewson
3c017e823b
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-26 12:53:38 -04:00
Nick Mathewson
6d3c5b8fb5
Merge branch 'bug22915_029_2' into maint-0.2.9
2017-07-26 12:53:13 -04:00
Nick Mathewson
fca1934c88
Suppress clang4-specific -Wdouble-promotion warnings
...
Wow, it sure seems like some compilers can't implement isnan() and
friends in a way that pleases themselves!
Fixes bug 22915. Bug trigged by 0.2.8.1-alpha and later; caused by
clang 4.
2017-07-26 12:53:00 -04:00
Isis Lovecruft
7b4585e2a3
Add a changes file for bug22636.
2017-07-17 21:44:59 +00:00
Nick Mathewson
f5d2f79aca
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-14 09:11:14 -04:00
Nick Mathewson
3a7d757140
Merge branch 'bug22916_027' into maint-0.2.9
2017-07-14 09:11:08 -04:00
Nick Mathewson
c1afbbe8fe
Merge branch 'bug22803_030' into maint-0.3.0
2017-07-14 09:06:33 -04:00
Nick Mathewson
3cec1783b7
Fix compiler warnings with openssl-scrypt/libscrypt test on clang
...
Clang didn't like that we were passing uint64_t values to an API
that wanted uint32_t. GCC has either not cared, or has figured out
that the values in question were safe to cast to uint32_t.
Fixes bug22916; bugfix on 0.2.7.2-alpha.
2017-07-13 17:49:48 -04:00
Nick Mathewson
ed0fb21834
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-07-07 10:56:31 -04:00
Nick Mathewson
66c85cd881
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-07 10:56:31 -04:00
Nick Mathewson
48e45e2fb1
Merge branch 'bug22838_028' into maint-0.2.8
2017-07-07 10:55:51 -04:00
Nick Mathewson
ae756f251f
mingw fix: avoid "unused var" warning.
...
This is a backport of 19615bce64
2017-07-07 10:54:24 -04:00
Nick Mathewson
5472066cd2
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-07-07 10:51:28 -04:00
