torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.6'

Browse Source
This commit is contained in:
Nick Mathewson
2015-03-04 12:15:10 +01:00
parent a1bdb6e42c 5ad47aafab
commit 6a8550fa3c
7 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+1 -1
View File
@@ -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"; \
changes/bug15037
+4
View File
@@ -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".
changes/bug15127
+3
View File
@@ -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.
changes/bug15151
+3
View File
@@ -0,0 +1,3 @@
o Minor bugfixes (compilation):
- Fix a compilation warning on FreeBSD. Fixes bug 15151; bugfix on
0.2.6.2-alpha.
src/common/include.am
+1
View File
@@ -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
src/or/connection_edge.c
+1 -1
View File
@@ -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:
src/or/include.am
+1
View File
@@ -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; \