summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-10-08 13:38:47 -0400
committerNick Mathewson <nickm@torproject.org>2013-10-08 13:38:47 -0400
commit66624ded3973ef9ad1e5fa5a3db53344186430e3 (patch)
tree6ce4aa9678fec8bdf71ed942e5baa123b1cf57f2 /changes
parentb571b966f2cc39e906a27bec6ae4f3e1e4376299 (diff)
parent50fc8fb5c5b591fbcaa7e9d5572fa52a1e1b19ae (diff)
downloadtor-66624ded3973ef9ad1e5fa5a3db53344186430e3.tar.gz
tor-66624ded3973ef9ad1e5fa5a3db53344186430e3.zip
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts: src/or/relay.c
Diffstat (limited to 'changes')
-rw-r--r--changes/bug99274
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug9927 b/changes/bug9927
new file mode 100644
index 0000000000..e66280c3c4
--- /dev/null
+++ b/changes/bug9927
@@ -0,0 +1,4 @@
+ o Minor features:
+ - Generate bootstrapping status update events correctly for fetching
+ microdescriptors. Fixes bug 9927.
+