Commit b80a8bba authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'feature3049-v2' into maint-0.2.2 

Conflicts:
	src/common/Makefile.am
parents 1ba1bdee 1e69c60d

changes/exit-policy-default-is-not-a-prefix

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - Remove a trailing asterisk from "exit-policy/default" in the

      output of the control port command "GETINFO info/names".  Bugfix

      on 0.1.2.5-alpha.

changes/feature3049

0 → 100644
+6 −0
Original line number Diff line number Diff line 
  o Major features:

    - Add an __OwningControllerProcess configuration option and a

      TAKEOWNERSHIP control-port command, so that a Tor controller can

      ensure that when it exits, Tor will shut down.  Implements

      feature 3049.

src/common/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ libor_extra_source= 
endif



libor_a_SOURCES = address.c log.c util.c compat.c container.c mempool.c \

	memarea.c di_ops.c util_codedigest.c $(libor_extra_source)

	memarea.c di_ops.c procmon.c util_codedigest.c $(libor_extra_source)

libor_crypto_a_SOURCES = crypto.c aes.c tortls.c torgzip.c

libor_event_a_SOURCES = compat_libevent.c



noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h tortls_states.h di_ops.h

noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h tortls_states.h di_ops.h procmon.h



common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)

	if test "@SHA1SUM@" != none; then \

src/common/compat.h

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ int get_n_open_sockets(void); 
#define tor_socket_send(s, buf, len, flags) send(s, buf, len, flags)

#define tor_socket_recv(s, buf, len, flags) recv(s, buf, len, flags)



/** Implementatino of struct in6_addr for platforms that do not have it.

/** Implementation of struct in6_addr for platforms that do not have it.

 * Generally, these platforms are ones without IPv6 support, but we want to

 * have a working in6_addr there anyway, so we can use it to parse IPv6

 * addresses. */

src/common/compat_libevent.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ typedef uint32_t le_version_t; 
 * it is. */

#define LE_OLD V(0,0,0)

/** Represents a version of libevent so weird we can't figure out what version

 * it it. */

 * it is. */

#define LE_OTHER V(0,0,99)



static le_version_t tor_get_libevent_version(const char **v_out);