Reorganize ChangeLog, pick up new tor, and tag build3

projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt

@@ -2,25 +2,23 @@ Tor Browser 9.5a12 -- May 6 2020
  * All Platforms
    * Update Firefox to 68.8.0esr
    * Bump NoScript to 11.0.25
+   * Bump Tor to 0.4.3.4-rc
    * Translations update
-   * Bug 34017: Bump openssl version to 1.1.1g
-   * Bug 33630: Remove noisebridge01 default bridge
    * Bug 31499: Update libevent to 2.1.11-stable
+   * Bug 33630: Remove noisebridge01 default bridge
+   * Bug 33726: Fix patch for #23247: Communicating security expectations for .onion
+   * Bug 34017: Bump openssl version to 1.1.1g
      * Bug 33877: Disable Samples and Regression tests For Libevent Build
    * Bug 33698: Update "About Tor Browser" links in Tor Browser
- * Android
-   * Translations update
-   * Bump Tor to 0.4.3.3-alpha
-   * Bug 33359: Use latest Version of TOPL and Remove Patches
-   * Bug 33931: obfs4 bridges are used instead of meek if meek is selected in Tor Browser for Android alpha
  * Windows + OS X + Linux
-   * Translations update
    * Update Tor Launcher to 0.2.21.6
      * Translations update
    * Bug 33573: Update pion-webrtc version to 2.2.3
-   * Bug 33726: Fix patch for #23247: Communicating security expectations for .onion
    * Bug 32418: Allow updates to be disabled via an enterprise policy.
    * Bug 34032: Use Securedrop's Official https-everywhere ruleset
+ * Android
+   * Bug 33359: Use latest Version of TOPL and Remove Patches
+   * Bug 33931: obfs4 bridges are used instead of meek if meek is selected in Tor Browser for Android alpha
  * Build System
    * All Platforms
      * Bug 32027: Bump Go to 1.13.10

projects/tor/config

 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-version: 0.4.3.3-alpha
+version: 0.4.3.4-rc
 git_hash: 'tor-[% c("version") %]'
 git_url: https://git.torproject.org/tor.git
 git_submodule: 1

rbm.conf

@@ -25,7 +25,7 @@ buildconf:
 
 var:
   torbrowser_version: '9.5a12'
-  torbrowser_build: 'build2'
+  torbrowser_build: 'build3'
   torbrowser_incremental_from:
     - 9.5a11
   project_name: tor-browser