Skip to content

Commit

Permalink
Upgraded Tor to 0.4.0.5 (#534)
Browse files Browse the repository at this point in the history 
* Upgraded Tor to 0.4.0.5
  • Loading branch information
@levonpetrosyan93 @a-bezrukov
levonpetrosyan93 authored and a-bezrukov committed Jul 25, 2019
1 parent f5c2ea5 commit 1b20364
Show file tree
Hide file tree
Showing 1,132 changed files with 175,865 additions and 97,666 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ src/tor.timestamp*

# Compilation and Qt preprocessor part
*.qm
Makefile
/Makefile
/src/Makefile
zcoin-qt
Zcoin-Qt.app

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,7 @@ if test x$need_bundled_univalue = xyes; then
fi

AX_SUBDIRS_CONFIGURE([src/secp256k1], [[--disable-shared], [--with-pic], [--with-bignum=no], [--enable-module-recovery], [--enable-experimental], [--enable-module-ecdh]])
AX_SUBDIRS_CONFIGURE([src/tor], [[--disable-unittests], [--disable-system-torrc], [--disable-systemd], [--disable-lzma], [--disable-zstd], [--disable-asciidoc]])
AX_SUBDIRS_CONFIGURE([src/tor], [[--disable-system-torrc], [--disable-systemd], [--disable-lzma], [--disable-zstd], [--disable-asciidoc]])


AC_OUTPUT
Expand Down
42 changes: 34 additions & 8 deletions src/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,45 @@ else
LIBUNIVALUE = $(UNIVALUE_LIBS)
endif

TOR_LIBS = tor/src/or/libtor.a \
tor/src/common/libor.a \
tor/src/common/libor-ctime.a \
tor/src/common/libor-crypto.a \
tor/src/common/libor-event.a \
TOR_LIBS = tor/src/core/libtor-app.a \
tor/src/lib/libtor-meminfo.a \
tor/src/lib/libtor-term.a \
tor/src/lib/libtor-osinfo.a \
tor/src/lib/libtor-geoip.a \
tor/src/lib/libtor-math.a \
tor/src/lib/libtor-tls.a \
tor/src/lib/libtor-process.a \
tor/src/lib/libtor-evloop.a \
tor/src/lib/libtor-thread.a \
tor/src/lib/libtor-compress.a \
tor/src/lib/libtor-net.a \
tor/src/lib/libtor-buf.a \
tor/src/lib/libtor-time.a \
tor/src/lib/libtor-err.a \
tor/src/lib/libtor-log.a \
tor/src/lib/libtor-version.a \
tor/src/lib/libtor-container.a \
tor/src/lib/libtor-crypt-ops.a \
tor/src/lib/libtor-fs.a \
tor/src/lib/libtor-fdio.a \
tor/src/lib/libtor-sandbox.a \
tor/src/lib/libtor-memarea.a \
tor/src/lib/libtor-intmath.a \
tor/src/lib/libtor-encoding.a \
tor/src/lib/libtor-smartlist-core.a \
tor/src/lib/libtor-lock.a \
tor/src/lib/libtor-wallclock.a \
tor/src/lib/libtor-string.a \
tor/src/lib/libtor-malloc.a \
tor/src/lib/libtor-ctime.a \
tor/src/trunnel/libor-trunnel.a \
tor/src/common/libcurve25519_donna.a \
tor/src/lib/libcurve25519_donna.a \
tor/src/ext/ed25519/donna/libed25519_donna.a \
tor/src/ext/ed25519/ref10/libed25519_ref10.a \
tor/src/ext/keccak-tiny/libkeccak-tiny.a

tor.timestamp: $(wildcard tor/src/or/*.c) $(wildcard tor/src/or/*.h) \
$(wildcard tor/src/common/*.c) $(wildcard tor/src/common/*.h) \
tor.timestamp: $(wildcard tor/src/core/or/*.c) $(wildcard tor/src/core/or/*.h) \
$(wildcard tor/src/lib/*.c) $(wildcard tor/src/lib/*.h) \
$(wildcard tor/src/trunnel/*.c) $(wildcard tor/src/trunnel/*.h) \
$(wildcard tor/src/ext/*.c) $(wildcard tor/src/ext/*.h)
@rm -f tor.timestamp.tmp
Expand Down
38 changes: 32 additions & 6 deletions src/Makefile.qt.include
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,13 +489,39 @@ if ENABLE_ZMQ
qt_zcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
endif

qt_zcoin_qt_LDADD += tor/src/or/libtor.a \
tor/src/common/libor.a \
tor/src/common/libor-ctime.a \
tor/src/common/libor-crypto.a \
tor/src/common/libor-event.a \
qt_zcoin_qt_LDADD += tor/src/core/libtor-app.a \
tor/src/lib/libtor-meminfo.a \
tor/src/lib/libtor-term.a \
tor/src/lib/libtor-osinfo.a \
tor/src/lib/libtor-geoip.a \
tor/src/lib/libtor-math.a \
tor/src/lib/libtor-tls.a \
tor/src/lib/libtor-process.a \
tor/src/lib/libtor-evloop.a \
tor/src/lib/libtor-thread.a \
tor/src/lib/libtor-compress.a \
tor/src/lib/libtor-net.a \
tor/src/lib/libtor-buf.a \
tor/src/lib/libtor-time.a \
tor/src/lib/libtor-err.a \
tor/src/lib/libtor-log.a \
tor/src/lib/libtor-version.a \
tor/src/lib/libtor-container.a \
tor/src/lib/libtor-crypt-ops.a \
tor/src/lib/libtor-fs.a \
tor/src/lib/libtor-fdio.a \
tor/src/lib/libtor-sandbox.a \
tor/src/lib/libtor-memarea.a \
tor/src/lib/libtor-intmath.a \
tor/src/lib/libtor-encoding.a \
tor/src/lib/libtor-smartlist-core.a \
tor/src/lib/libtor-lock.a \
tor/src/lib/libtor-wallclock.a \
tor/src/lib/libtor-string.a \
tor/src/lib/libtor-malloc.a \
tor/src/lib/libtor-ctime.a \
tor/src/trunnel/libor-trunnel.a \
tor/src/common/libcurve25519_donna.a \
tor/src/lib/libcurve25519_donna.a \
tor/src/ext/ed25519/donna/libed25519_donna.a \
tor/src/ext/ed25519/ref10/libed25519_ref10.a \
tor/src/ext/keccak-tiny/libkeccak-tiny.a
Expand Down
41 changes: 33 additions & 8 deletions src/Makefile.test.include
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,17 +131,42 @@ BITCOIN_TESTS += \
wallet/test/txbuilder_tests.cpp
endif

test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) tor/src/or/libtor.a \
tor/src/common/libor.a \
tor/src/common/libor-ctime.a \
tor/src/common/libor-crypto.a \
tor/src/common/libor-event.a \
test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) tor/src/core/libtor-app.a \
tor/src/lib/libtor-meminfo.a \
tor/src/lib/libtor-term.a \
tor/src/lib/libtor-osinfo.a \
tor/src/lib/libtor-geoip.a \
tor/src/lib/libtor-math.a \
tor/src/lib/libtor-tls.a \
tor/src/lib/libtor-process.a \
tor/src/lib/libtor-evloop.a \
tor/src/lib/libtor-thread.a \
tor/src/lib/libtor-compress.a \
tor/src/lib/libtor-net.a \
tor/src/lib/libtor-buf.a \
tor/src/lib/libtor-time.a \
tor/src/lib/libtor-err.a \
tor/src/lib/libtor-log.a \
tor/src/lib/libtor-version.a \
tor/src/lib/libtor-container.a \
tor/src/lib/libtor-crypt-ops.a \
tor/src/lib/libtor-fs.a \
tor/src/lib/libtor-fdio.a \
tor/src/lib/libtor-sandbox.a \
tor/src/lib/libtor-memarea.a \
tor/src/lib/libtor-intmath.a \
tor/src/lib/libtor-encoding.a \
tor/src/lib/libtor-smartlist-core.a \
tor/src/lib/libtor-lock.a \
tor/src/lib/libtor-wallclock.a \
tor/src/lib/libtor-string.a \
tor/src/lib/libtor-malloc.a \
tor/src/lib/libtor-ctime.a \
tor/src/trunnel/libor-trunnel.a \
tor/src/common/libcurve25519_donna.a \
tor/src/lib/libcurve25519_donna.a \
tor/src/ext/ed25519/donna/libed25519_donna.a \
tor/src/ext/ed25519/ref10/libed25519_ref10.a \
tor/src/ext/keccak-tiny/libkeccak-tiny.a $(ZLIB_LIBS) -lz

tor/src/ext/keccak-tiny/libkeccak-tiny.a
test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)
test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS)

Expand Down
4 changes: 0 additions & 4 deletions src/init.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,6 @@ extern CTxMemPool stempool;

namespace fs = boost::filesystem;

extern const char tor_git_revision[];
const char tor_git_revision[] = "";


extern "C" {
int tor_main(int argc, char *argv[]);
void tor_cleanup(void);
Expand Down
62 changes: 0 additions & 62 deletions src/tor/.appveyor.yml
View file

This file was deleted.

Loading

0 comments on commit 1b20364

Please sign in to comment.