diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-09-20 16:50:32 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2014-09-20 16:50:32 -0400 |
| commit | 87576e826f5f60d13478bb9de642be0e6f5533a1 (patch) | |
| tree | ba664d4e56ac77509b740e84ee0949be760d2dfb /changes | |
| parent | be0e26272b3e795b902394acc9b66642fcdc1f21 (diff) | |
| parent | 288b3ec6035aad694942960f3b71693907f7e584 (diff) | |
| download | tor-87576e826f5f60d13478bb9de642be0e6f5533a1.tar.gz tor-87576e826f5f60d13478bb9de642be0e6f5533a1.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/bug13100 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/changes/bug13100 b/changes/bug13100 new file mode 100644 index 0000000000..bbe43e65a7 --- /dev/null +++ b/changes/bug13100 @@ -0,0 +1,3 @@ + o Directory authority changes: + - Change IP address for gabelmoo (v3 directory authority). + |