[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'gk/bug_29307_v7'

[boklm at torproject.org]

commit b00d30e8a5a91533d8fc8c7786793b72348638cf
Merge: e7c10d7 cfcb23a
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri May 3 17:15:18 2019 +0200

    Merge remote-tracking branch 'gk/bug_29307_v7'

 projects/argparse/build                            | 19 ++------
 projects/argparse/config                           |  8 ----
 projects/debootstrap-image/config                  | 23 +++------
 projects/fteproxy/build                            | 24 ++--------
 projects/fteproxy/config                           |  8 ----
 projects/libfte/bug20302.patch                     | 36 --------------
 projects/libfte/build                              | 24 ++--------
 projects/libfte/config                             |  9 ----
 projects/obfsproxy/build                           | 23 ++-------
 projects/obfsproxy/config                          |  8 ----
 projects/parsley/build                             | 21 ++-------
 projects/parsley/config                            |  8 ----
 projects/pycrypto/build                            | 28 +++--------
 projects/pycrypto/config                           |  7 ---
 projects/pyptlib/build                             | 21 ++-------
 projects/pyptlib/config                            |  8 ----
 projects/pyyaml/build                              | 21 ++-------
 projects/pyyaml/config                             |  8 ----
 projects/rust/config                               |  1 +
 .../PTConfigs/windows/torrc-defaults-appendix      |  3 --
 projects/tor-browser/build                         |  8 ++--
 projects/tor-browser/config                        | 15 +-----
 projects/twisted/build                             | 30 ++----------
 projects/twisted/config                            |  8 ----
 projects/txsocksx/build                            | 21 ++-------
 projects/txsocksx/config                           |  8 ----
 projects/winpython/build                           | 36 --------------
 projects/winpython/config                          | 55 ----------------------
 projects/winpython/pyc-timestamp.sh                | 18 -------
 projects/winpython/wine-wrappers/common.py         | 27 -----------
 projects/winpython/wine-wrappers/dllwrap.py        | 36 --------------
 projects/winpython/wine-wrappers/g++.py            | 39 ---------------
 projects/winpython/wine-wrappers/gcc.py            | 36 --------------
 projects/winpython/wine-wrappers/settings.py       |  2 -
 projects/winpython/wine-wrappers/setup.py          |  7 ---
 projects/zope.interface/build                      | 27 ++---------
 projects/zope.interface/config                     |  9 ----
 rbm.conf                                           |  4 +-
 38 files changed, 66 insertions(+), 628 deletions(-)