summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-12-23 08:08:19 -0500
committerNick Mathewson <nickm@torproject.org>2016-12-23 08:08:19 -0500
commit99513f763c1867e0f6f45c47d2ad36c4f4097a42 (patch)
tree81f280021f1b5c4a6fd13b165c4213c66f997d88
parent8d3f412cdace9bec7883152735103ffedbd8ad65 (diff)
parentaaeb50b2f30218f3e92601cdc0833dd11f624c20 (diff)
downloadtor-99513f763c1867e0f6f45c47d2ad36c4f4097a42.tar.gz
tor-99513f763c1867e0f6f45c47d2ad36c4f4097a42.zip
Merge branch 'maint-0.2.9' into release-0.2.9
-rw-r--r--changes/bug210356
1 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug21035 b/changes/bug21035
new file mode 100644
index 0000000000..bbf3340787
--- /dev/null
+++ b/changes/bug21035
@@ -0,0 +1,6 @@
+ o Minor bugfixes (portability):
+ - Avoid crashing when Tor is built using headers that contain
+ CLOCK_MONOTONIC_COARSE, but then tries to run on an older kernel
+ without CLOCK_MONOTONIC_COARSE. Fixes bug 21035; bugfix on
+ 0.2.9.1-alpha.
+