commit 5ff9ab39b16ab03f4c2fcc515e54bd0fe24050a3 Author: Tomás Touceda chiiph@torproject.org Date: Tue Jul 10 19:46:00 2012 -0300

Fold in changes --- CHANGELOG | 7 +++++++ changes/appendRouterStatus | 1 - changes/bug4337 | 1 - changes/bug5351 | 1 - changes/bug6178 | 1 - 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG index 1e027e0..942c027 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +0.2.20 09-Jul-2012 + o Append router status information if Tor is using microdescriptors. + o Display paths with their native separators. Resolves ticket 4337. + o Do not ignore the Show on Startup checkbox. Fixes bug 5351. + o Do not add relative root to DataDirectory if it is empty. Fixes + bug 6178. + 0.2.19 30-May-2012 o Disable "Run Vidalia when my system starts" if the BrowserExecutable config option is set. This will avoid issues with diff --git a/changes/appendRouterStatus b/changes/appendRouterStatus deleted file mode 100644 index 7a579d7..0000000 --- a/changes/appendRouterStatus +++ /dev/null @@ -1 +0,0 @@ - o Append router status information if Tor is using microdescriptors. diff --git a/changes/bug4337 b/changes/bug4337 deleted file mode 100644 index f5703d3..0000000 --- a/changes/bug4337 +++ /dev/null @@ -1 +0,0 @@ - o Display paths with their native separators. Resolves ticket 4337. diff --git a/changes/bug5351 b/changes/bug5351 deleted file mode 100644 index b01def8..0000000 --- a/changes/bug5351 +++ /dev/null @@ -1 +0,0 @@ - o Do not ignore the Show on Startup checkbox. Fixes bug 5351. diff --git a/changes/bug6178 b/changes/bug6178 deleted file mode 100644 index e727ed9..0000000 --- a/changes/bug6178 +++ /dev/null @@ -1 +0,0 @@ - o Do not add relative root to DataDirectory if it is empty. Fixes bug 6178.