commit de3791281953327f0472e6e9313e184a7aab2be1 Author: Mike Perry mikeperry-git@torproject.org Date: Fri Aug 29 00:54:29 2014 -0700

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

diff --git a/src/CHANGELOG b/src/CHANGELOG index 5b35a6a..0943687 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.6.12.1 + 1 Sep 2014 + * Bug 12684: Add `canvas.notNow` UI strings to torbutton.properties file. + * Bug 8940: Move RecommendedTBBVersions file to www.torproject.org. + 1.6.12.0 4 Aug 2014 * Bug 9531: Workaround to avoid rare hangs during New Identity diff --git a/src/install.rdf b/src/install.rdf index f8c0f97..de66e4e 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.0</em:version> + em:version1.6.12.1</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>