commit 3f80c17eb67f2836c1652f43f693e0a99c152747 Author: Mike Perry mikeperry-git@torproject.org Date: Mon Sep 29 17:22:56 2014 -0700

Update changelog and version for 1.7.0.0-pre. --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG index 1f925c6..11c50a7 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.7.0.0 + ?? + * Bug 10751: Adapt Torbutton to ESR31's Australis UI. + * Bug 13138: ESR31-about:tor shows "Tor is not working" + 1.6.12.3 23 Sep 2014 * Bug 10804: Workaround for some TBB startup hangs diff --git a/src/install.rdf b/src/install.rdf index bf5ec16..2411179 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ em:nameTorbutton</em:name> em:creatorMike Perry</em:creator> em:idtorbutton@torproject.org</em:id> - em:version1.6.12.3</em:version> + em:version1.7.0.0-pre</em:version> em:homepageURLhttps://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> em:optionsURLchrome://torbutton/content/preferences.xul</em:optionsURL> em:iconURLchrome://torbutton/skin/tor.png</em:iconURL>