torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,796 Commits 53 Branches 631 Tags
19e01f0cbcdf09ddcbf9a54ce3a3d601f42ea7a9
Commit Graph
26796 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 19e01f0cbc Merge branch 'maint-0.3.2' into release-0.3.2 2017-12-04 13:23:52 -05:00
David Goulet ff6c8cf861 sched: Downgrade warning log to info in KIST 
Some platforms don't have good monotonic time support so don't warn when the
diff between the last run of the scheduler time and now is negative. The
scheduler recovers properly from this so no need to be noisy.

Fixes #23696

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2017-12-04 12:22:02 -05:00
Nick Mathewson fe12c9756a Merge branch 'maint-0.3.2' into release-0.3.2 2017-12-01 12:13:40 -05:00
Nick Mathewson b86c9acac3 Merge branch 'maint-0.3.1' into maint-0.3.2 2017-12-01 12:13:40 -05:00
Nick Mathewson 5c03bb7c0c Merge branch 'maint-0.3.0' into maint-0.3.1 2017-12-01 12:13:40 -05:00
Nick Mathewson 3bca705c54 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-12-01 12:13:40 -05:00
Nick Mathewson 953a8f8510 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-12-01 12:13:40 -05:00
Nick Mathewson f97f301b5b Merge branch 'maint-0.2.5' into maint-0.2.8 2017-12-01 12:13:39 -05:00
Nick Mathewson 461e34bb3d Fix a clang compilation warning in rendservice.c 
Fixes bug 24480; bugfix on 0.2.5.16.
 2017-12-01 12:13:15 -05:00
Nick Mathewson e0d1ab4172 Merge branch 'maint-0.3.2' into release-0.3.2 2017-12-01 09:35:43 -05:00
Nick Mathewson 909c91049a Merge branch 'maint-0.3.1' into maint-0.3.2 
"ours" merge to avoid version bump.
 2017-12-01 09:35:31 -05:00
Nick Mathewson 7fae562a4d Merge branch 'maint-0.3.0' into maint-0.3.1 
"ours" merge to avoid version bump.
 2017-12-01 09:35:25 -05:00
Nick Mathewson 6e3ec8222c Merge branch 'maint-0.2.9' into maint-0.3.0 
"ours" merge to avoid version bump.
 2017-12-01 09:35:16 -05:00
Nick Mathewson 495db72c1e Merge branch 'maint-0.2.8' into maint-0.2.9 
"ours" merge to avoid version bump.
 2017-12-01 09:35:07 -05:00
Nick Mathewson dc3890439f Merge branch 'maint-0.2.5' into maint-0.2.8 
"ours" merge to avoid version bump.
 2017-12-01 09:34:47 -05:00
Nick Mathewson 998a247123 bump to 0.3.2.6-alpha-dev 2017-12-01 09:34:31 -05:00
Nick Mathewson a12dbbd882 bump to 0.3.1.9-dev 2017-12-01 09:34:20 -05:00
Nick Mathewson 1983068ba9 bump to 0.3.0.13-dev 2017-12-01 09:34:09 -05:00
Nick Mathewson 73869c99a0 bump to 0.2.9.14-dev 2017-12-01 09:34:00 -05:00
Nick Mathewson 8f858de819 bump to 0.2.8.17-dev 2017-12-01 09:33:51 -05:00
Nick Mathewson 162a087e5f bump to 0.2.5.16-dev 2017-12-01 09:33:41 -05:00
Nick Mathewson 87012d076e Re-flow the changelog. tor-0.3.2.6-alpha 2017-11-30 14:44:04 -05:00
Nick Mathewson 26f5da96b2 changelog edits from arma 2017-11-30 14:42:49 -05:00
Nick Mathewson c66ce3419d changelog for 0.3.2.6-alpha. 2017-11-30 12:34:32 -05:00
Nick Mathewson 9eb17cb7ba Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-30 12:28:39 -05:00
Nick Mathewson 424ab08b5a bump to 0.3.2.6-alpha 2017-11-30 12:26:30 -05:00
Nick Mathewson 9c89e8e435 Merge branch 'maint-0.3.1' into maint-0.3.2 
"ours" to avoid version bumps
 2017-11-30 12:25:53 -05:00
Nick Mathewson 4ebd436541 version bump to 0.3.1.9 2017-11-30 12:25:48 -05:00
Nick Mathewson 6b9c2ac23e Merge branch 'maint-0.3.0' into maint-0.3.1 
"ours" to avoid version bump.
 2017-11-30 12:25:07 -05:00
Nick Mathewson f2ecdeb724 version bump to 0.3.0.13 2017-11-30 12:25:01 -05:00
Nick Mathewson 8f36104574 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-11-30 12:24:13 -05:00
Nick Mathewson 16c9cfd658 version bump to 0.2.9.14 2017-11-30 12:24:07 -05:00
Nick Mathewson 1fd6e25522 Merge branch 'maint-0.2.8' into maint-0.2.9 
"ours" merge to avoid version bump.
 2017-11-30 12:22:38 -05:00
Nick Mathewson 6ee4472544 version bump to 0.2.8.17 2017-11-30 12:22:32 -05:00
Nick Mathewson 2e219291be Merge branch 'maint-0.2.5' into maint-0.2.8 
"ours" to avoid version bump
 2017-11-30 12:21:36 -05:00
Nick Mathewson 6bda6777c1 bump to 0.2.5.16 2017-11-30 12:19:48 -05:00
Nick Mathewson c981cd4311 Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-30 12:07:59 -05:00
Nick Mathewson fd73a168ca Merge branch 'maint-0.3.1' into maint-0.3.2 2017-11-30 12:07:59 -05:00
Nick Mathewson ee48eb1eb5 Merge branch 'maint-0.3.0' into maint-0.3.1 2017-11-30 12:07:59 -05:00
Nick Mathewson 5fc0587c04 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-11-30 12:07:59 -05:00
Nick Mathewson 7e2b012b46 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-11-30 12:07:59 -05:00
Nick Mathewson ba4a9cf0c0 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-11-30 12:07:59 -05:00
Nick Mathewson d459c08b7d Merge branch 'trove-2017-012_030' into maint-0.3.0 2017-11-30 12:07:43 -05:00
Nick Mathewson 52d7af631c Merge branch 'trove-2017-010_029' into maint-0.2.9 2017-11-30 12:07:26 -05:00
Nick Mathewson f49876d66e Merge branch 'trove-2017-012_025' into maint-0.2.5 2017-11-30 12:06:21 -05:00
Nick Mathewson 08ce39fb0f Merge branch 'trove-2017-011_025' into maint-0.2.5 2017-11-30 12:06:17 -05:00
Nick Mathewson a6a0c7a4ec Merge branch 'trove-2017-009_025' into maint-0.2.5 2017-11-30 12:05:59 -05:00
Nick Mathewson 75509dc827 Fix changes file 2017-11-30 11:52:40 -05:00
Nick Mathewson 500975da96 Merge branch 'maint-0.3.2' into release-0.3.2 2017-11-30 11:48:12 -05:00
Nick Mathewson 25d50decb2 Merge branch 'maint-0.3.1' into maint-0.3.2 2017-11-30 11:48:12 -05:00