diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-04 12:15:10 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-04 12:15:10 +0100 |
| commit | 6a8550fa3c1a435a5c6d3759b893b10f1899e570 (patch) | |
| tree | 0622523a85a361fa5ab7313e189f8ce7a4a7f51e | |
| parent | a1bdb6e42cea6b2a7b6f5dfb937752f9fd997599 (diff) | |
| parent | 5ad47aafabfdb9718b4beb7c3893af58a9147e2e (diff) | |
| download | tor-6a8550fa3c1a435a5c6d3759b893b10f1899e570.tar.gz tor-6a8550fa3c1a435a5c6d3759b893b10f1899e570.zip | |
Merge remote-tracking branch 'origin/maint-0.2.6'
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | changes/bug15037 | 4 | ||||
| -rw-r--r-- | changes/bug15127 | 3 | ||||
| -rw-r--r-- | changes/bug15151 | 3 | ||||
| -rw-r--r-- | src/common/include.am | 1 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 2 | ||||
| -rw-r--r-- | src/or/include.am | 1 |
7 files changed, 14 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 67c9cc9d25..b1f92f5b34 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,7 +73,7 @@ test-network: all test-stem: $(TESTING_TOR_BINARY) @if test -d "$$STEM_SOURCE_DIR"; then \ - "$$STEM_SOURCE_DIR"/run_tests.py --tor $(TESTING_TOR_BINARY) --all --log notice --target RUN_ALL; \ + $(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor $(TESTING_TOR_BINARY) --all --log notice --target RUN_ALL; \ else \ echo '$$STEM_SOURCE_DIR was not set.'; echo; \ echo "To run these tests, git clone https://git.torproject.org/stem.git/ ; export STEM_SOURCE_DIR=\`pwd\`/stem"; \ diff --git a/changes/bug15037 b/changes/bug15037 new file mode 100644 index 0000000000..587d63186e --- /dev/null +++ b/changes/bug15037 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - When running the new 'make test-stem' target, use the configured + python binary. Fixes bug 15037; bugfix on 0.2.6.3-alpha. Patch + from "cypherpunks". diff --git a/changes/bug15127 b/changes/bug15127 new file mode 100644 index 0000000000..642dc02bc1 --- /dev/null +++ b/changes/bug15127 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Add missing dependencies to fix compilation on BSD. Patch from + Peter Palfrader. Fixes bug 15127; bugfix on 0.2.5.1-alpha. diff --git a/changes/bug15151 b/changes/bug15151 new file mode 100644 index 0000000000..b9c3061554 --- /dev/null +++ b/changes/bug15151 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Fix a compilation warning on FreeBSD. Fixes bug 15151; bugfix on + 0.2.6.2-alpha. diff --git a/src/common/include.am b/src/common/include.am index 5b63392541..a642f7a79c 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -146,4 +146,5 @@ src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(COMMONHEA fi src/common/util_codedigest.o: src/common/common_sha1.i +src/common/src_common_libor_testing_a-util_codedigest.o: src/common/common_sha1.i diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 3c817decfb..e6dfc634e9 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1598,7 +1598,6 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req) struct sockaddr_storage orig_dst; socklen_t orig_dst_len = sizeof(orig_dst); tor_addr_t addr; - int rv; #ifdef TRANS_TRPOXY if (options->TransProxyType_parsed == TPT_TPROXY) { @@ -1613,6 +1612,7 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req) #endif #ifdef TRANS_NETFILTER + int rv = -1; switch (ENTRY_TO_CONN(conn)->socket_family) { #ifdef TRANS_NETFILTER_IPV4 case AF_INET: diff --git a/src/or/include.am b/src/or/include.am index b44e1099dc..e257ceb8cc 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -190,6 +190,7 @@ ORHEADERS = \ noinst_HEADERS+= $(ORHEADERS) micro-revision.i src/or/config_codedigest.o: src/or/or_sha1.i +src/or/src_or_libtor_testing_a-config_codedigest.o: src/or/or_sha1.i micro-revision.i: FORCE @rm -f micro-revision.tmp; \ |