Browse code

update the website for the big TBB 3.x release!

Erinn Clark authored on19/12/2013 01:10:44
Showing4 changed files
... ...
@@ -13,7 +13,7 @@
13 13
 <define-tag button-win-tbb32>Tor Browser Bundle</define-tag>
14 14
 <define-tag button-win-tbb64>Currently Unused</define-tag>
15 15
 <define-tag button-osx-tbb32>Tor Browser Bundle</define-tag>
16
-<define-tag button-osx-tbb64>Mac 64-bit</define-tag>
16
+#<!-- Commented out until further notice. -EC <define-tag button-osx-tbb64>Mac 64-bit</define-tag> -->
17 17
 <define-tag button-lin-tbb32>Tor Browser Bundle</define-tag>
18 18
 <define-tag button-lin-tbb64>GNU/Linux 64-bit</define-tag>
19 19
 
... ...
@@ -36,13 +36,13 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
36 36
       <div id="windows" class="easy windows">
37 37
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
38 38
 	  <form class="downloads">
39
-	    <a class="button win-tbb" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
39
+	    <a class="button win-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
40 40
 	    <select name="language" id="win-tbb" class="lang">
41 41
 #include <lang.wmi>
42 42
 	    </select>
43 43
 	    <div class="sig" style="margin-bottom: 5px;">
44 44
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a>
45
-	      (<a class="win-tbb-sig" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
45
+	      (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
46 46
 	    </div>
47 47
 	  </form>
48 48
 	  <div class="desc">
... ...
@@ -57,13 +57,13 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
57 57
       <div id="mac" class="easy mac">
58 58
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
59 59
 	  <form class="downloads">
60
-	    <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
60
+	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
61 61
 	    <select name="language" id="osx-tbb" class="lang">
62 62
 #include <lang.wmi>
63 63
 	    </select>
64 64
 	    <div class="sig" style="margin-bottom: 5px;">
65 65
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
66
-	      (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
66
+	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
67 67
 	    </div>
68 68
 	  </form>
69 69
 	  <div class="desc">
... ...
@@ -74,17 +74,18 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
74 74
 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>
75 75
 	</div>
76 76
       </div>
77
-<!-- START MAC 64-->
77
+<!-- START MAC 64 -->
78
+<!-- Comment out MAC 64 until it exists. -EC
78 79
       <div class="easy mac">
79 80
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
80 81
 	  <form class="downloads">
81
-	    <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
82
+	    <a class="button osx-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
82 83
 	    <select name="language" id="osx-tbb64" class="lang">
83 84
 #include <lang.wmi>
84 85
 	    </select>
85 86
 	    <div class="sig" style="margin-bottom: 5px;">
86 87
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
87
-	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
88
+	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
88 89
 	    </div>
89 90
 	  </form>
90 91
 	  <div class="desc">
... ...
@@ -92,6 +93,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
92 93
 	    <em>Version <version-torbrowserbundleosx64> - OS X (64-Bit) (10.6+)</em>
93 94
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
94 95
 	  </div>
96
+-->
95 97
 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>
96 98
 	</div>
97 99
       </div>
... ...
@@ -99,13 +101,13 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
99 101
       <div id="linux" class="easy linux">
100 102
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
101 103
 	  <form class="downloads">
102
-	    <a class="button lin-tbb32" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
104
+	    <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
103 105
 	    <select name="language" id="lin-tbb32" class="lang">
104 106
 #include <lang.wmi>
105 107
 	    </select>
106 108
 	    <div class="sig" style="margin-bottom: 5px;">
107 109
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
108
-	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
110
+	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
109 111
 	    </div>
110 112
 	  </form>
111 113
 	  <div class="desc">
... ...
@@ -120,13 +122,13 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
120 122
       <div class="easy linux">
121 123
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
122 124
 	  <form class="downloads">
123
-	    <a class="button lin-tbb64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
125
+	    <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
124 126
 	    <select name="language" id="lin-tbb64" class="lang">
125 127
 #include <lang.wmi>
126 128
 	    </select>
127 129
 	    <div class="sig" style="margin-bottom: 5px;">
128 130
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
129
-	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
131
+	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
130 132
 	    </div>
131 133
 	  </form>
132 134
 	  <div class="desc">
... ...
@@ -13,7 +13,7 @@
13 13
 <define-tag button-win-tbb32>Tor Browser Bundle</define-tag>
14 14
 <define-tag button-win-tbb64>Currently Unused</define-tag>
15 15
 <define-tag button-osx-tbb32>Tor Browser Bundle</define-tag>
16
-<define-tag button-osx-tbb64>64-bit</define-tag>
16
+#<!-- Comment out until it's available again. -EC <define-tag button-osx-tbb64>64-bit</define-tag> -->
17 17
 <define-tag button-lin-tbb32>Tor Browser Bundle</define-tag>
18 18
 <define-tag button-lin-tbb64>64-bit</define-tag>
19 19
 
... ...
@@ -41,16 +41,16 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
41 41
 #<!-- NOTE - change language enabled button text at the top of this page -->
42 42
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
43 43
 	  <form class="downloads">
44
-	    <a class="button win-tbb" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
44
+	    <a class="button win-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
45 45
 	    <select name="language" id="win-tbb" class="lang">
46 46
 #include <lang.wmi>
47 47
 	    </select>
48 48
 	    <div class="sig">
49 49
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a>
50
-	      (<a class="win-tbb-sig" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
50
+	      (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
51 51
 	    </div>
52 52
 	    <a class="additional" href="<page projects/torbrowser-details>#build">Source Code</a><br />
53
-<!--	    <a class="additional" href="../dist/torbrowser/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">Download Unstable</a> (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)-->
53
+<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)-->
54 54
 	  </form>
55 55
 
56 56
 	  <h2>Tor Browser Bundle</h2>
... ...
@@ -124,24 +124,27 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
124 124
 #<!-- NOTE - change language enabled button text at the top of this page -->
125 125
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
126 126
 	  <form class="downloads">
127
-	    <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
127
+	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
128 128
 	    <select name="language" id="osx-tbb" class="lang">
129 129
 #include <lang.wmi>
130 130
 	    </select>
131 131
 	    <div class="sig">
132 132
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
133
-	      (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
133
+	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
134 134
 	    </div>
135
-	    <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
135
+<!-- Comment out until 64-bit OSX bundles are available again
136
+	    <a class="button osx-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
136 137
 	    <select name="language" id="osx-tbb64" class="lang">
138
+-->
137 139
 #include <lang.wmi>
140
+<!-- OSX 64. -EC
138 141
 	    </select>
139 142
 	    <div class="sig">
140 143
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
141
-	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
144
+	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
142 145
 	    </div>
143 146
 	    <a href="<page projects/torbrowser-details>#build">Source Code</a><br />
144
-<!--	    <a class="additional" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)-->
147
+	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)-->
145 148
 	  </form>
146 149
 
147 150
 	  <h2>Tor Browser Bundle</h2>
... ...
@@ -159,26 +162,26 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
159 162
 #<!-- NOTE - change language enabled button text at the top of this page -->
160 163
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
161 164
 	  <form class="downloads">
162
-	    <a class="button lin-tbb32" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
165
+	    <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
163 166
 	    <select name="language" id="lin-tbb32" class="lang">
164 167
 #include <lang.wmi>
165 168
 	    </select>
166 169
 	    <div class="sig">
167 170
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
168
-	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
171
+	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
169 172
 	    </div>
170
-<!--	    <a class="additional" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)<p>-->
173
+<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)<p>-->
171 174
 
172
-	    <a class="button lin-tbb64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
175
+	    <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
173 176
 	    <select name="language" id="lin-tbb64" class="lang">
174 177
 #include <lang.wmi>
175 178
 	    </select>
176 179
 	    <div class="sig">
177 180
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
178
-	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
181
+	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
179 182
 	    </div>
180 183
 	    <a class="additional" href="<page projects/torbrowser-details>#build">Source Code</a><br />
181
-<!--	    <a class="additional" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)-->
184
+<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)-->
182 185
 	  </form>
183 186
 
184 187
 	  <h2>Tor Browser Bundle</h2>
... ...
@@ -23,10 +23,12 @@
23 23
 <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag>
24 24
 <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag>
25 25
 
26
-<define-tag version-torbrowserbundle whitespace=delete>2.3.25-15</define-tag>
26
+<define-tag version-torbrowserbundledir whitespace=delete>3.5</define-tag>
27
+
28
+<define-tag version-torbrowserbundle whitespace=delete>3.5</define-tag>
27 29
 <define-tag version-torbrowser-tor whitespace=delete>0.2.3.25</define-tag>
28
-<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag>
29
-<define-tag version-torbrowser-firefox whitespace=delete>17.0.11esr</define-tag>
30
+<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag>
31
+<define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
30 32
 <define-tag version-torbrowser-torbutton whitespace=delete>1.5.2</define-tag>
31 33
 <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag>
32 34
 <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag>
... ...
@@ -35,11 +37,11 @@
35 37
 <define-tag version-torbrowserbundlealpha whitespace=delete>2.4.18-rc-1</define-tag>
36 38
 <define-tag version-torobfsbundlealpha whitespace=delete>2.4.18-rc-1-pt1</define-tag>
37 39
 
38
-<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-15</define-tag>
39
-<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-16</define-tag>
40
-<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.3.25</define-tag>
40
+<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.5</define-tag>
41
+<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.5</define-tag>
42
+<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
41 43
 <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag>
42
-<define-tag version-gnu-torbrowser-firefox whitespace=delete>17.0.11esr</define-tag>
44
+<define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
43 45
 <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag>
44 46
 <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag>
45 47
 <define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.18-rc-1</define-tag>
... ...
@@ -47,10 +49,10 @@
47 49
 <define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.18-rc-1-pt1</define-tag>
48 50
 <define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.18-rc-2-pt1</define-tag>
49 51
 
50
-<define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-15</define-tag>
52
+<define-tag version-torbrowserbundleosx32 whitespace=delete>3.5</define-tag>
51 53
 <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag>
52
-<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.3.25</define-tag>
53
-<define-tag version-osx-torbrowser-firefox whitespace=delete>17.0.11esr</define-tag>
54
+<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
55
+<define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
54 56
 <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag>
55 57
 <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.21</define-tag>
56 58
 <define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.18-rc-1</define-tag>
... ...
@@ -96,189 +96,190 @@
96 96
 	      <tbody>
97 97
 		<tr>
98 98
 		  <td>English (en-US)</td>
99
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">32-bit</a> 
100
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>)</em></td>
101
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-en-US.zip">32-bit</a> 
102
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-en-US.zip.asc">sig</a>)</em> 
103
-		  &bull; <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-en-US.zip">64-bit</a> 
104
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-en-US.zip.asc">sig</a>)</em></td>
105
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz">32-bit</a> 
106
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz.asc">sig</a>)</em> 
107
-		  &bull; <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz">64-bit</a> 
108
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz.asc">sig</a>)</em></td>
99
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_en-US.exe">32-bit</a> 
100
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>)</em></td>
101
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_en-US.zip">32-bit</a> 
102
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_en-US.zip.asc">sig</a>)</em> 
103
+		  <!-- EC&bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-en-US.zip">64-bit</a> 
104
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-en-US.zip.asc">sig</a>)</em></td> -->
105
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.gz">32-bit</a> 
106
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.gz.asc">sig</a>)</em> 
107
+		  &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_en-US.tar.gz">64-bit</a> 
108
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_en-US.tar.gz.asc">sig</a>)</em></td>
109 109
 		</tr>
110 110
 		<tr class="alt">
111 111
 		  <td>&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar)</td>
112
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ar.exe">32-bit</a> 
113
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ar.exe.asc">sig</a>)</em></td>
114
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ar.zip">32-bit</a> 
115
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ar.zip.asc">sig</a>)</em> 
116
-		  &bull; <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ar.zip">64-bit</a> 
117
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ar.zip.asc">sig</a>)</em></td>
118
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ar.tar.gz">32-bit</a> 
119
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ar.tar.gz.asc">sig</a>)</em> 
120
-		  &bull; <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ar.tar.gz">64-bit</a> 
121
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ar.tar.gz.asc">sig</a>)</em></td>
112
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ar.exe">32-bit</a> 
113
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ar.exe.asc">sig</a>)</em></td>
114
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ar.zip">32-bit</a> 
115
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ar.zip.asc">sig</a>)</em> 
116
+		  <!-- EC&bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ar.zip">64-bit</a> 
117
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ar.zip.asc">sig</a>)</em></td> -->
118
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ar.tar.gz">32-bit</a> 
119
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ar.tar.gz.asc">sig</a>)</em> 
120
+		  &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ar.tar.gz">64-bit</a> 
121
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ar.tar.gz.asc">sig</a>)</em></td>
122 122
 		</tr>
123 123
 		<tr>
124 124
 		  <td>Deutsch (de)</td>
125
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_de.exe">32-bit</a> 
126
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_de.exe.asc">sig</a>)</em></td>
127
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-de.zip">32-bit</a> 
128
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-de.zip.asc">sig</a>)</em> 
129
-		  &bull; <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-de.zip">64-bit</a> 
130
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-de.zip.asc">sig</a>)</em></td>
131
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-de.tar.gz">32-bit</a> 
132
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-de.tar.gz.asc">sig</a>)</em> 
133
-		  &bull; <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-de.tar.gz">64-bit</a> 
134
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-de.tar.gz.asc">sig</a>)</em></td>
125
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_de.exe">32-bit</a> 
126
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_de.exe.asc">sig</a>)</em></td>
127
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_de.zip">32-bit</a> 
128
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_de.zip.asc">sig</a>)</em> 
129
+		  <!-- EC &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-de.zip">64-bit</a> 
130
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-de.zip.asc">sig</a>)</em></td> -->
131
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_de.tar.gz">32-bit</a> 
132
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_de.tar.gz.asc">sig</a>)</em> 
133
+		  &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_de.tar.gz">64-bit</a> 
134
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_de.tar.gz.asc">sig</a>)</em></td>
135 135
 		</tr>
136 136
 		<tr class="alt">
137 137
 		  <td>&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES)</td>
138
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_es-ES.exe">32-bit</a> 
139
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_es-ES.exe.asc">sig</a>)</em></td>
140
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-es-ES.zip">32-bit</a> 
141
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-es-ES.zip.asc">sig</a>)</em> 
142
-		  &bull; <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-es-ES.zip">64-bit</a> 
143
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-es-ES.zip.asc">sig</a>)</em></td>
144
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-es-ES.tar.gz">32-bit</a> 
145
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-es-ES.tar.gz.asc">sig</a>)</em> 
146
-		  &bull; <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-es-ES.tar.gz">64-bit</a> 
147
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-es-ES.tar.gz.asc">sig</a>)</em></td>
138
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_es-ES.exe">32-bit</a> 
139
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_es-ES.exe.asc">sig</a>)</em></td>
140
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_es-ES.zip">32-bit</a> 
141
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_es-ES.zip.asc">sig</a>)</em> 
142
+		  <!-- EC&bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-es-ES.zip">64-bit</a> 
143
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-es-ES.zip.asc">sig</a>)</em></td> -->
144
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_es-ES.tar.gz">32-bit</a> 
145
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_es-ES.tar.gz.asc">sig</a>)</em> 
146
+		  &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_es-ES.tar.gz">64-bit</a> 
147
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_es-ES.tar.gz.asc">sig</a>)</em></td>
148 148
 		</tr>
149 149
 		<tr>
150 150
 		  <td>&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa)</td>
151
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fa.exe">32-bit</a>
152
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fa.exe.asc">sig</a>)</em></td>
153
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-fa.zip">32-bit</a> 
154
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-fa.zip.asc">sig</a>)</em> 
155
-		  &bull; <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fa.zip">64-bit</a> 
156
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fa.zip.asc">sig</a>)</em></td>
157
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fa.tar.gz">32-bit</a> 
158
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fa.tar.gz.asc">sig</a>)</em> 
159
-		  &bull; <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fa.tar.gz">64-bit</a> 
160
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fa.tar.gz.asc">sig</a>)</em></td>
151
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_fa.exe">32-bit</a>
152
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_fa.exe.asc">sig</a>)</em></td>
153
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fa.zip">32-bit</a> 
154
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fa.zip.asc">sig</a>)</em> 
155
+		  <!-- EC&bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fa.zip">64-bit</a> 
156
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fa.zip.asc">sig</a>)</em></td> -->
157
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_fa.tar.gz">32-bit</a> 
158
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_fa.tar.gz.asc">sig</a>)</em> 
159
+		  &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_fa.tar.gz">64-bit</a> 
160
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_fa.tar.gz.asc">sig</a>)</em></td>
161 161
 		</tr>
162 162
 		<tr class="alt">
163 163
 		  <td>&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr)</td>
164
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fr.exe">32-bit</a>
165
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fr.exe.asc">sig</a>)</em></td>
166
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-fr.zip">32-bit</a> 
167
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-fr.zip.asc">sig</a>)</em> 
168
-		  &bull; <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fr.zip">64-bit</a> 
169
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fr.zip.asc">sig</a>)</em></td>
170
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fr.tar.gz">32-bit</a> 
171
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fr.tar.gz.asc">sig</a>)</em> 
172
-		  &bull; <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fr.tar.gz">64-bit</a> 
173
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fr.tar.gz.asc">sig</a>)</em></td>
164
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_fr.exe">32-bit</a>
165
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_fr.exe.asc">sig</a>)</em></td>
166
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fr.zip">32-bit</a> 
167
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fr.zip.asc">sig</a>)</em> 
168
+		  <!-- EC &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fr.zip">64-bit</a> 
169
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fr.zip.asc">sig</a>)</em></td> -->
170
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_fr.tar.gz">32-bit</a> 
171
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_fr.tar.gz.asc">sig</a>)</em> 
172
+		  &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_fr.tar.gz">64-bit</a> 
173
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_fr.tar.gz.asc">sig</a>)</em></td>
174 174
 		</tr>
175 175
 		<tr>
176 176
 		  <td>Italiano (it)</td>
177
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_it.exe">32-bit</a>
178
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_it.exe.asc">sig</a>)</em></td>
179
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-it.zip">32-bit</a> 
180
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-it.zip.asc">sig</a>)</em> 
181
-		  &bull; <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-it.zip">64-bit</a> 
182
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-it.zip.asc">sig</a>)</em></td>
183
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-it.tar.gz">32-bit</a> 
184
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-it.tar.gz.asc">sig</a>)</em> 
185
-		  &bull; <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-it.tar.gz">64-bit</a> 
186
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-it.tar.gz.asc">sig</a>)</em></td>
177
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_it.exe">32-bit</a>
178
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_it.exe.asc">sig</a>)</em></td>
179
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_it.zip">32-bit</a> 
180
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_it.zip.asc">sig</a>)</em> 
181
+		  <!-- EC &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-it.zip">64-bit</a> 
182
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-it.zip.asc">sig</a>)</em></td> -->
183
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_it.tar.gz">32-bit</a> 
184
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_it.tar.gz.asc">sig</a>)</em> 
185
+		  &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_it.tar.gz">64-bit</a> 
186
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_it.tar.gz.asc">sig</a>)</em></td>
187 187
 		</tr>
188 188
 		<tr class="alt">
189 189
 		  <td>Korean (ko)</td>
190
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ko.exe">32-bit</a> 
191
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ko.exe.asc">sig</a>)</em></td>
192
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ko.zip">32-bit</a> 
193
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ko.zip.asc">sig</a>)</em> 
194
-		  &bull; <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ko.zip">64-bit</a> 
195
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ko.zip.asc">sig</a>)</em></td>
196
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ko.tar.gz">32-bit</a> 
197
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ko.tar.gz.asc">sig</a>)</em> 
198
-		  &bull; <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ko.tar.gz">64-bit</a> 
199
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ko.tar.gz.asc">sig</a>)</em></td>
190
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ko.exe">32-bit</a> 
191
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ko.exe.asc">sig</a>)</em></td>
192
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ko.zip">32-bit</a> 
193
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ko.zip.asc">sig</a>)</em> 
194
+		  <!-- &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ko.zip">64-bit</a> 
195
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ko.zip.asc">sig</a>)</em></td> -->
196
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ko.tar.gz">32-bit</a> 
197
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ko.tar.gz.asc">sig</a>)</em> 
198
+		  &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ko.tar.gz">64-bit</a> 
199
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ko.tar.gz.asc">sig</a>)</em></td>
200 200
 		</tr>
201 201
 		<tr>
202 202
 		  <td>Nederlands (nl)</td>
203
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_nl.exe">32-bit</a> 
204
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_nl.exe.asc">sig</a>)</em></td>
205
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-nl.zip">32-bit</a> 
206
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-nl.zip.asc">sig</a>)</em> 
207
-		  &bull; <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-nl.zip">64-bit</a> 
208
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-nl.zip.asc">sig</a>)</em></td>
209
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz">32-bit</a> 
210
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz.asc">sig</a>)</em> 
211
-		  &bull; <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-nl.tar.gz">64-bit</a> 
212
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-nl.tar.gz.asc">sig</a>)</em></td>
203
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_nl.exe">32-bit</a> 
204
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_nl.exe.asc">sig</a>)</em></td>
205
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_nl.zip">32-bit</a> 
206
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_nl.zip.asc">sig</a>)</em> 
207
+		  <!-- EC &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-nl.zip">64-bit</a> 
208
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-nl.zip.asc">sig</a>)</em></td> -->
209
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_nl.tar.gz">32-bit</a> 
210
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_nl.tar.gz.asc">sig</a>)</em> 
211
+		  &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_nl.tar.gz">64-bit</a> 
212
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_nl.tar.gz.asc">sig</a>)</em></td>
213 213
 		</tr>
214 214
 		<tr class="alt">
215 215
 		  <td>Polish (pl)</td>
216
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pl.exe">32-bit</a> 
217
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pl.exe.asc">sig</a>)</em></td>
218
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-pl.zip">32-bit</a> 
219
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-pl.zip.asc">sig</a>)</em> 
220
-		  &bull; <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pl.zip">64-bit</a> 
221
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pl.zip.asc">sig</a>)</em></td>
222
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-pl.tar.gz">32-bit</a> 
223
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-pl.tar.gz.asc">sig</a>)</em> 
224
-		  &bull; <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-pl.tar.gz">64-bit</a> 
225
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-pl.tar.gz.asc">sig</a>)</em></td>
216
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_pl.exe">32-bit</a> 
217
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_pl.exe.asc">sig</a>)</em></td>
218
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pl.zip">32-bit</a> 
219
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pl.zip.asc">sig</a>)</em> 
220
+		  <!-- &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pl.zip">64-bit</a> 
221
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pl.zip.asc">sig</a>)</em></td> -->
222
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pl.tar.gz">32-bit</a> 
223
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pl.tar.gz.asc">sig</a>)</em> 
224
+		  &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pl.tar.gz">64-bit</a> 
225
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pl.tar.gz.asc">sig</a>)</em></td>
226 226
 		</tr>
227 227
 		<tr>
228 228
 		  <td>&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; (pt-PT)</td>
229
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pt-PT.exe">32-bit</a> 
230
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pt-PT.exe.asc">sig</a>)</em></td>
231
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-pt-PT.zip">32-bit</a> 
232
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-pt-PT.zip.asc">sig</a>)</em> 
233
-		  &bull; <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pt-PT.zip">64-bit</a> 
234
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pt-PT.zip.asc">sig</a>)</em></td>
235
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-pt-PT.tar.gz">32-bit</a> 
236
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-pt-PT.tar.gz.asc">sig</a>)</em> 
237
-		  &bull; <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-pt-PT.tar.gz">64-bit</a> 
238
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-pt-PT.tar.gz.asc">sig</a>)</em></td>
229
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_pt-PT.exe">32-bit</a> 
230
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_pt-PT.exe.asc">sig</a>)</em></td>
231
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pt-PT.zip">32-bit</a> 
232
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pt-PT.zip.asc">sig</a>)</em> 
233
+		  <!-- EC &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pt-PT.zip">64-bit</a> 
234
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pt-PT.zip.asc">sig</a>)</em></td> -->
235
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pt-PT.tar.gz">32-bit</a> 
236
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pt-PT.tar.gz.asc">sig</a>)</em> 
237
+		  &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pt-PT.tar.gz">64-bit</a> 
238
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pt-PT.tar.gz.asc">sig</a>)</em></td>
239 239
 		</tr>
240 240
 		<tr class="alt">
241 241
 		  <td>&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru)</td>
242
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ru.exe">32-bit</a> 
243
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ru.exe.asc">sig</a>)</em></td>
244
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ru.zip">32-bit</a> 
245
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ru.zip.asc">sig</a>)</em> 
246
-		  &bull; <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ru.zip">64-bit</a> 
247
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ru.zip.asc">sig</a>)</em></td>
248
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ru.tar.gz">32-bit</a> 
249
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ru.tar.gz.asc">sig</a>)</em> 
250
-		  &bull; <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ru.tar.gz">64-bit</a> 
251
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ru.tar.gz.asc">sig</a>)</em></td>
242
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ru.exe">32-bit</a> 
243
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ru.exe.asc">sig</a>)</em></td>
244
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ru.zip">32-bit</a> 
245
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ru.zip.asc">sig</a>)</em> 
246
+		  <!-- &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ru.zip">64-bit</a> 
247
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ru.zip.asc">sig</a>)</em></td> -->
248
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ru.tar.gz">32-bit</a> 
249
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ru.tar.gz.asc">sig</a>)</em> 
250
+		  &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ru.tar.gz">64-bit</a> 
251
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ru.tar.gz.asc">sig</a>)</em></td>
252 252
 		</tr>
253 253
 		<tr>
254 254
 		  <td>Vietnamese (vi)</td>
255
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_vi.exe">32-bit</a> 
256
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_vi.exe.asc">sig</a>)</em></td>
257
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-vi.zip">32-bit</a> 
258
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-vi.zip.asc">sig</a>)</em> 
259
-		  &bull; <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-vi.zip">64-bit</a> 
260
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-vi.zip.asc">sig</a>)</em></td>
261
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-vi.tar.gz">32-bit</a> 
262
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-vi.tar.gz.asc">sig</a>)</em> 
263
-		  &bull; <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-vi.tar.gz">64-bit</a> 
264
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-vi.tar.gz.asc">sig</a>)</em></td>
255
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_vi.exe">32-bit</a> 
256
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_vi.exe.asc">sig</a>)</em></td>
257
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_vi.zip">32-bit</a> 
258
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_vi.zip.asc">sig</a>)</em> 
259
+		  <!-- &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-vi.zip">64-bit</a> 
260
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-vi.zip.asc">sig</a>)</em></td> -->
261
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_vi.tar.gz">32-bit</a> 
262
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_vi.tar.gz.asc">sig</a>)</em> 
263
+		  &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_vi.tar.gz">64-bit</a> 
264
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_vi.tar.gz.asc">sig</a>)</em></td>
265 265
 		</tr>
266 266
 		<tr class="alt">
267 267
 		  <td>&#x7b80;&#x4f53;&#x5b57; (zh-CN)</td>
268
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_zh-CN.exe">32-bit</a> 
269
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_zh-CN.exe.asc">sig</a>)</em></td>
270
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-zh-CN.zip">32-bit</a> 
271
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-zh-CN.zip.asc">sig</a>)</em> 
272
-		  &bull; <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-zh-CN.zip">64-bit</a> 
273
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-zh-CN.zip.asc">sig</a>)</em></td>
274
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-CN.tar.gz">32-bit</a> 
275
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-CN.tar.gz.asc">sig</a>)</em> 
276
-		  &bull; <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-zh-CN.tar.gz">64-bit</a> 
277
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-zh-CN.tar.gz.asc">sig</a>)</em></td>
268
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_zh-CN.exe">32-bit</a> 
269
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_zh-CN.exe.asc">sig</a>)</em></td>
270
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_zh-CN.zip">32-bit</a> 
271
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_zh-CN.zip.asc">sig</a>)</em> 
272
+		  <!-- EC &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-zh-CN.zip">64-bit</a> 
273
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-zh-CN.zip.asc">sig</a>)</em></td> -->
274
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_zh-CN.tar.gz">32-bit</a> 
275
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_zh-CN.tar.gz.asc">sig</a>)</em> 
276
+		  &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_zh-CN.tar.gz">64-bit</a> 
277
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_zh-CN.tar.gz.asc">sig</a>)</em></td>
278 278
 		</tr>
279 279
 	      </tbody>
280 280
 	    </table>
281 281
 	  </div>
282
+<!-- Disable development releases until they exist again. -EC
282 283
 	  <div class="dltable" style="margin-top:-10px">
283 284
 	    <table>
284 285
 	      <thead>
... ...
@@ -292,20 +293,21 @@
292 293
 	      <tbody>
293 294
 		<tr class="alt">
294 295
 		  <td>English (en-US)</td>
295
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">32-bit</a> 
296
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)</em></td>
297
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">32-bit</a> 
298
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)</em> 
299
-		  &bull; <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64alpha>-osx-x86_64-en-US.zip">64-bit</a> 
300
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64alpha>-osx-x86_64-en-US.zip.asc">sig</a>)</em></td>
301
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">32-bit</a> 
302
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)</em> 
303
-		  &bull; <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">64-bit</a> 
304
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)</em></td>
296
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">32-bit</a> 
297
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)</em></td>
298
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">32-bit</a> 
299
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)</em> 
300
+		  <!-- EC &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64alpha>-osx-x86_64-en-US.zip">64-bit</a> 
301
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64alpha>-osx-x86_64-en-US.zip.asc">sig</a>)</em></td> -->
302
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">32-bit</a> 
303
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)</em> 
304
+		  &bull; <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">64-bit</a> 
305
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)</em></td>
305 306
 		</tr>
306 307
 	      </tbody>
307 308
 	    </table>
308 309
 	  </div>
310
+-->
309 311
 
310 312
 	  <p>See our instructions on <a href="<page docs/verifying-signatures>">how to verify package signatures</a>,
311 313
 	  which allows you to make sure you've downloaded the file we intended
... ...
@@ -322,8 +324,7 @@
322 324
 	  <p>Download the file above, save it somewhere, then click on it.
323 325
 	  Mac OS X will automatically unarchive it and you will have a TorBrowser application
324 326
 	  in your chosen language. <em>(e.g. TorBrowser_en-US.app)</em></p>
325
-	  <p>Click the TorBrowser application to launch Vidalia.</p>
326
-	  <p>Once Vidalia connects to the Tor Network, it will launch TorBrowser.</p>
327
+	  <p>Click the TorBrowserBundle application to launch TorBrowser.</p>
327 328
 	</div>
328 329
 	<div class="pjimage"><img src="$(IMGROOT)/screenshot-osx-torbrowser-icon.png" alt="Screenshot Mac OS X bundle" width="414" height="315"></div>
329 330
       </div>
... ...
@@ -333,16 +334,16 @@
333 334
 	<div class="pjtext">
334 335
 	  <p>Download the architecture-appropriate file above, save it somewhere, then
335 336
 	  run one of the following two commands to extract the package archive:</p>
336
-	  <p><code>tar -xvzf tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<var>LANG</var>.tar.gz</code></p>
337
+	  <p><code>tar -xvJf tor-browser-linux32-<version-torbrowserbundlelinux32>_<var>LANG</var>.tar.gz</code></p>
337 338
 	  <p>or (for the 64-bit version):</p>
338
-	  <p><code>tar -xvzf tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<var>LANG</var>.tar.gz</code></p>
339
+	  <p><code>tar -xvJf tor-browser-linux64-<version-torbrowserbundlelinux64>_<var>LANG</var>.tar.gz</code></p>
339 340
 	  <p><em>(where <var>LANG</var> is the language listed in the filename).</em></p>
340 341
 	  <p>Once that's done, switch to the Tor browser directory by running:</p>
341 342
 	  <p><code>cd tor-browser_<var>LANG</var></code></p>
342 343
 	  <p><em>(where <var>LANG</var> is the language listed in the filename).</em><p>
343 344
 	  <p>To run the Tor Browser Bundle, execute the <strong>start-tor-browser</strong> script:</p>
344 345
 	  <p><code>./start-tor-browser</code></p>
345
-	  <p>This will launch Vidalia and once that connects to Tor, it will launch
346
+	  <p>This will launch Tor Launcher and once that connects to Tor, it will launch
346 347
 	  Firefox. <strong><em>Do not unpack or run TBB as root.</em></strong></p>
347 348
 	</div>
348 349
       </div>
... ...
@@ -365,7 +366,7 @@
365 366
 	  <p>Once extraction is complete, open the folder <strong>Tor Browser</strong> from the location you saved the bundle.</p>
366 367
 	  <p>Double click on the <strong>Start Tor Browser</strong> (4) application (it may be called
367 368
 	  <strong>Start Tor Browser.exe</strong> on some systems.)</p>
368
-	  <p>The Vidalia window will shortly appear.</p>
369
+	  <p>The TorBrowser window will shortly appear.</p>
369 370
 	  <p><a href="$(IMGROOT)/tbb-screenshot2.png"><img src="$(IMGROOT)/tbb-screenshot2.png" alt="Screenshot of
370 371
 	  bundle startup" width="860" height="538"></a></p>
371 372
 	  <p>Once Tor is ready, Tor Browser will automatically be opened. Only web pages
... ...
@@ -402,7 +403,7 @@
402 403
 	  <p><strong><em>What is Tor and why do I need it?</em></strong> 
403 404
 	  <br>To learn more about Tor, visit the <a href="<page index>">Tor Project website</a>.</p>
404 405
 	  <p><strong><em>What is in the Tor Browser Bundle?</em></strong>
405
-	  <br>It contains Tor, Vidalia, a modified Firefox ESR, and Torbutton 
406
+	  <br>It contains Tor, a modified Firefox ESR, and Torbutton 
406 407
 	  (<a href="https://www.torproject.org/torbrowser/design/">design</a>) (<a
407 408
 	  href="<page projects/torbrowser-details>#contents">version details</a>).</p>
408 409
 	  <p><strong><em>How can I make my own bundle?</em></strong>