summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-09-21 10:58:06 -0400
committerNick Mathewson <nickm@torproject.org>2017-09-21 10:58:06 -0400
commit4c7a89a226be2f75400f3fc22d19ec9c31acd891 (patch)
tree67f1a0aafd41fc063a835bf33ed65501ca6f278a /changes
parent0f6bbbc74bef96a71480e0d59fb3e1a89c14a950 (diff)
parentad814cad41a101a3afd03ed0fdc55e2efd696abf (diff)
downloadtor-4c7a89a226be2f75400f3fc22d19ec9c31acd891.tar.gz
tor-4c7a89a226be2f75400f3fc22d19ec9c31acd891.zip
Merge remote-tracking branch 'catalyst-oniongit/bug23607'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug236064
-rw-r--r--changes/bug236074
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug23606 b/changes/bug23606
new file mode 100644
index 0000000000..77f4d0cb9e
--- /dev/null
+++ b/changes/bug23606
@@ -0,0 +1,4 @@
+ o Minor bugfixes (bootstrapping):
+ - When warning about state file clock skew, report the correct
+ direction for the detected skew. Fixes bug 23606; bugfix on
+ 0.2.8.1-alpha.
diff --git a/changes/bug23607 b/changes/bug23607
new file mode 100644
index 0000000000..7aa48a94c6
--- /dev/null
+++ b/changes/bug23607
@@ -0,0 +1,4 @@
+ o Minor bugfixes (bootstrapping):
+ - Avoid an assertion failure when logging a state file clock skew
+ very early in bootstrapping. Fixes bug 23607; bugfix on
+ 0.3.2.1-alpha.