Nick Mathewson
39ade001a7
Merge branch 'maint-0.3.1'
2017-08-01 11:30:33 -04:00
Nick Mathewson
b2d528d3be
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:30:33 -04:00
Nick Mathewson
4d26203528
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:30:33 -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
ba7d6a1e14
Merge branch 'maint-0.3.1'
2017-08-01 11:28:40 -04:00
Nick Mathewson
751c718273
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:28:40 -04:00
Nick Mathewson
f69797b67c
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:28:39 -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
2ee1a084f2
Merge branch 'maint-0.3.1'
2017-08-01 11:24:09 -04:00
Nick Mathewson
bf91b6e05f
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:24:09 -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
069728bdd7
Merge branch 'maint-0.3.1'
2017-08-01 11:23:01 -04:00
Nick Mathewson
9b65d7f415
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:23:01 -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
a05ceaaeb6
Merge branch 'maint-0.3.1'
2017-08-01 11:21:19 -04:00
Nick Mathewson
5a739e59a4
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:21:19 -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
64e5600103
Merge branch 'maint-0.3.1'
2017-08-01 11:19:30 -04:00
Nick Mathewson
4a19498edc
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:19:30 -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
925ef048a9
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-08-01 11:19:29 -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
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
18115b5aa9
Document some operators usage conventions.
2017-08-01 10:50:52 -04:00
Nick Mathewson
a374fa7285
Remove changes files for items already in release-0.3.1
2017-08-01 10:26:27 -04:00
Nick Mathewson
f0d440681c
Merge branch 'maint-0.3.1'
...
"ours" merge to avoid version bump.
2017-07-31 14:32:01 -04:00
Nick Mathewson
572f23a96e
Now that "base -1" is a bug, tell our unit tests to expect bug warnings
...
Bugfix on accb734c5fc45481231b837; bug not in any released Tor.
2017-07-31 14:30:04 -04:00
Nick Mathewson
2cb8c8d99f
Bump to 0.3.1.5-alpha
2017-07-31 14:29:33 -04:00
Nick Mathewson
769a94d9ce
Bug 23055: cast, then multiply when doing u32*u32->u64.
...
No backport, since this bug won't trigger until people make
certificates expiring after the Y2106 deadline.
CID 1415728
2017-07-28 10:33:51 -04:00
Nick Mathewson
accb734c5f
Turn base < 0 into a BUG() in our long-parse functions.
2017-07-28 10:26:06 -04:00
Nick Mathewson
decb927685
Add an assertion to try to please coverity.
...
Coverity, for some reason, thought that weight_scale might be 0,
leading to a divide-by-zero error.
2017-07-28 10:17:57 -04:00
Nick Mathewson
602c52cad4
Coverity deadcode shenanigans on BUG() macro.
...
We don't actually want Coverity to complain when a BUG() check can
never fail, since such checks can prevent us from introducing bugs
later on.
Closes ticket 23054. Closes CID 1415720, 1415724.
2017-07-28 10:02:38 -04:00
Nick Mathewson
5f0fa480dd
Merge branch 'maint-0.3.1'
2017-07-28 09:54:39 -04:00
Nick Mathewson
eb677c5870
Fix an unreachable memory leak in the unit tests
...
This is CID 1415726.
2017-07-28 09:52:34 -04:00
Nick Mathewson
6252e04a37
Merge branch 'maint-0.3.1'
2017-07-28 09:50:26 -04:00
Nick Mathewson
911e2dc530
Merge branch 'bug23053_029' into maint-0.3.1
2017-07-28 09:50:16 -04:00
Nick Mathewson
9a0f38a349
Fix a small memory leak when parsing unix: ports twice
...
Fixes bug 23053; CID 1415725.
2017-07-28 09:49:42 -04:00
Nick Mathewson
baf53300d7
Merge branch 'maint-0.3.1'
2017-07-27 20:33:01 -04:00
Nick Mathewson
af3079a492
Try to work around a compile warning in workqueue.c
2017-07-27 20:32:59 -04:00
Nick Mathewson
15ed1c0c83
Merge branch 'maint-0.3.1'
2017-07-27 16:30:52 -04:00
Nick Mathewson
ba334c00da
Merge branch 'multi-priority_squashed' into maint-0.3.1
2017-07-27 16:29:34 -04:00
Nick Mathewson
fdd8156ea3
Fix the cpuworker.c documentation to mention all the kinds of work
2017-07-27 16:28:59 -04:00
Nick Mathewson
f5a852de91
Note that threadpool_queue_work...() can't actually return NULL
2017-07-27 16:28:59 -04:00
Nick Mathewson
250c88014d
Always start with one additional worker thread
...
Now that half the threads are permissive and half are strict, we
need to make sure we have at least two threads, so that we'll
have at least one of each kind.
2017-07-27 16:28:59 -04:00
Nick Mathewson
0ae0b5aa41
Queue consensus diffs at LOW priority.
...
Fixes bug 22883.
2017-07-27 16:28:59 -04:00
