diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-01-07 09:40:23 -0800 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-01-07 09:40:23 -0800 |
| commit | 9ca329581af71c9aa6890b63c29c6a51ac37e408 (patch) | |
| tree | b9816e646c80b56684cdc51770db6ac438cc263c /changes | |
| parent | ae223138fbdd28ef452191c3a489e25e9a9b22c7 (diff) | |
| parent | 11f63d26acb8ca872d894fb1423b380dc1f8dc2e (diff) | |
| download | tor-9ca329581af71c9aa6890b63c29c6a51ac37e408.tar.gz tor-9ca329581af71c9aa6890b63c29c6a51ac37e408.zip | |
Merge branch 'maint-0.2.4' into maint-0.2.5
Conflicts:
src/or/config.c
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug17906 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug17906 b/changes/bug17906 new file mode 100644 index 0000000000..fff76d1c59 --- /dev/null +++ b/changes/bug17906 @@ -0,0 +1,4 @@ + o Minor features (authorities): + - Update the V3 identity key for dannenberg, it was changed on + 18 November 2015. + Closes task #17906. Patch by "teor". |