40c7871f46
Merge branch 'maint-0.3.1'
2017-08-03 09:14:12 -04:00
1168e21b45
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-03 09:14:12 -04:00
b548371f76
Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0
2017-08-03 09:12:23 -04:00
17073d7234
Merge branch 'maint-0.3.1'
2017-08-03 09:11:03 -04:00
b13bf65062
Merge branch 'bug23081_025' into maint-0.3.1
2017-08-03 09:10:58 -04:00
3e68db02c4
In ntmain, call set_main_thread() before running the loop.
...
Patch from Vort; fixes bug 23081; bugfix on fd992deeea
2017-08-03 09:09:08 -04:00
2624cd63ee
add changes file for STRUCT_OFFSET removeal (22521)
2017-08-03 08:57:52 -04:00
02fcb29d11
Merge branch 'maint-0.3.1'
2017-08-03 08:44:32 -04:00
f33c96610f
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-03 08:44:31 -04:00
e220e6e437
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-03 08:44:31 -04:00
9696021593
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-08-03 08:44:31 -04:00
93b28972c1
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-08-03 08:44:31 -04:00
1280de42a4
Update geoip and geoip6 to the August 3 2017 database.
2017-08-03 10:00:54 +02:00
c4c5077af2
Merge branch 'maint-0.3.1'
2017-08-02 12:51:46 -04:00
a9a8d53dec
Merge branch 'bug23071_031' into maint-0.3.1
2017-08-02 12:51:42 -04:00
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
e72734959b
Remove one more changes file for item already in release-0.3.1
2017-08-01 11:31:52 -04:00
58e1c6dd86
Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9
2017-08-01 11:30:29 -04:00
8500f0e4e1
Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9
2017-08-01 11:28:36 -04:00
84c4a2bc3f
Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0
2017-08-01 11:24:02 -04:00
7c68b2f1a5
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:23:00 -04:00
2b94b0ea72
Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9
2017-08-01 11:22:42 -04:00
1d48712c28
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:21:19 -04:00
f6ecda8400
Merge remote-tracking branch 'public/bug18100_029' into maint-0.2.9
2017-08-01 11:21:14 -04:00
4a19498edc
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:19:30 -04:00
64e5600103
Merge branch 'maint-0.3.1'
2017-08-01 11:19:30 -04:00
9d24a352c0
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:19:30 -04:00
0e7558ab64
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-08-01 11:19:29 -04:00
925ef048a9
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-08-01 11:19:29 -04:00
a48ae2aa67
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-08-01 11:19:29 -04:00
6862eada65
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-08-01 11:19:29 -04:00
0bfd1c318c
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-08-01 11:19:28 -04:00
6199e27a2b
Merge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4
2017-08-01 11:19:24 -04:00
a374fa7285
Remove changes files for items already in release-0.3.1
2017-08-01 10:26:27 -04:00
8b5b7d470f
Fix the hs_ntor integration tests to work with the pysha3 module
...
The sha3 module should still work. Fixes bug 23071; bugfix on
0.3.1.1-alpha.
2017-07-31 20:28:42 -04:00
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
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
6252e04a37
Merge branch 'maint-0.3.1'
2017-07-28 09:50:26 -04:00
911e2dc530
Merge branch 'bug23053_029' into maint-0.3.1
2017-07-28 09:50:16 -04:00
9a0f38a349
Fix a small memory leak when parsing unix: ports twice
...
Fixes bug 23053; CID 1415725.
2017-07-28 09:49:42 -04:00
15ed1c0c83
Merge branch 'maint-0.3.1'
2017-07-27 16:30:52 -04:00
ba334c00da
Merge branch 'multi-priority_squashed' into maint-0.3.1
2017-07-27 16:29:34 -04:00
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
0ae0b5aa41
Queue consensus diffs at LOW priority.
...
Fixes bug 22883.
2017-07-27 16:28:59 -04:00
10e0bff4ca
Add support for multi-priority workqueues
...
Each piece of queued work now has an associated priority value; each
priority goes on a separate queue.
With probability (N-1)/N, the workers will take work from the highest
priority nonempty queue. Otherwise, they'll look for work in a
queue of lower priority. This behavior is meant to prevent
starvation for lower-priority tasks.
2017-07-27 16:28:05 -04:00
c2844d5377
Merge branch 'bug22895_027'
2017-07-27 11:27:07 -04:00
89c0a00a9a
Remove unused variables in donna's SSE2 code
...
Fixes unused-const-variable warnings with GCC on 32-bit x86 systems.
Closes #22895 .
2017-07-27 11:26:13 -04:00
ced2dd5f92
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-07-27 08:23:37 -04:00
b387dd364f
Merge branch 'maint-0.3.1'
2017-07-27 08:23:37 -04:00
ad35e595e5
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-27 08:23:36 -04:00
Nick Mathewson
Karsten Loesing
David Goulet
cypherpunks