December 2017 - tor-commits - lists.torproject.org

[tor/master] Stop waiting for microdescs if the consensus supports IPv6 ORPorts
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit b66b62fb7525cac1e18385e130249ce24f5c9fea Author: teor <teor2345(a)gmail.com> Date: Sat Dec 2 23:03:50 2017 +1100 Stop waiting for microdescs if the consensus supports IPv6 ORPorts Also make IPv6-only clients wait for microdescs for relays, even if we were previously using descriptors (or were using them as a bridge) and have a cached descriptor for them. But if node_is_a_configured_bridge(), stop waiting for its IPv6 address in a microdescriptor, because we'll never use it. Implements #23827. --- changes/bug23827 | 8 ++++++++ src/or/policies.c | 31 ++++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/changes/bug23827 b/changes/bug23827 new file mode 100644 index 000000000..6954ef891 --- /dev/null +++ b/changes/bug23827 @@ -0,0 +1,8 @@ + o Minor feature (IPv6): + - When a consensus has IPv6 ORPorts, make IPv6-only clients use them, + rather than waiting to download microdescriptors. + Implements #23827. + - Make IPv6-only clients wait for microdescs for relays, even if we were + previously using descriptors (or were using them as a bridge) and have + a cached descriptor for them. + Implements #23827. diff --git a/src/or/policies.c b/src/or/policies.c index fc033c559..a5bde2fe7 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -18,6 +18,7 @@ #define POLICIES_PRIVATE #include "or.h" +#include "bridges.h" #include "config.h" #include "dirserv.h" #include "microdesc.h" @@ -893,9 +894,10 @@ fascist_firewall_choose_address_ipv4h(uint32_t ipv4h_addr, pref_ipv6, ap); } -/* The microdescriptor consensus has no IPv6 addresses in rs: they are in - * the microdescriptors. This means we can't rely on the node's IPv6 address - * until its microdescriptor is available (when using microdescs). +/* Some microdescriptor consensus methods have no IPv6 addresses in rs: they + * are in the microdescriptors. For these consensus methods, we can't rely on + * the node's IPv6 address until its microdescriptor is available (when using + * microdescs). * But for bridges, rewrite_node_address_for_bridge() updates node->ri with * the configured address, so we can trust bridge addresses. * (Bridges could gain an IPv6 address if their microdescriptor arrives, but @@ -913,11 +915,26 @@ node_awaiting_ipv6(const or_options_t* options, const node_t *node) return 0; } + /* If the node has an IPv6 address, we're not waiting */ + if (node_has_ipv6_addr(node)) { + return 0; + } + + /* If the current consensus method and flavour has IPv6 addresses, we're not + * waiting */ + if (networkstatus_consensus_has_ipv6(options)) { + return 0; + } + + /* Bridge clients never use the address from a bridge's md, so there's no + * need to wait for it. */ + if (node_is_a_configured_bridge(node)) { + return 0; + } + /* We are waiting if we_use_microdescriptors_for_circuits() and we have no - * md. Bridges have a ri based on their config. They would never use the - * address from their md, so there's no need to wait for it. */ - return (!node->md && we_use_microdescriptors_for_circuits(options) && - !node->ri); + * md. */ + return (!node->md && we_use_microdescriptors_for_circuits(options)); } /** Like fascist_firewall_choose_address_base(), but takes rs.

1 0

[tor/master] Add support for Android's logging subsystem.
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit b0b8f7c30c8296344c77d06a24821f35b667e3dd Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Dec 11 13:12:25 2017 +0000 Add support for Android's logging subsystem. This patch adds support for Android's logging subsystem in Tor. When debugging Android applications it is useful to be able to collect information about the application running on the platform via the various system services that is available on the platform. This patch allows you to add "Log notice android" to your torrc and have Tor send everything above and including the notice severity to Android's ring buffer which can be inspected using the 'adb logcat' program. See: https://bugs.torproject.org/24362 --- changes/bug24362 | 2 ++ configure.ac | 14 ++++++++++ doc/tor.1.txt | 5 ++++ src/common/log.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++--- src/common/torlog.h | 6 +++- src/or/config.c | 19 +++++++++++++ src/or/or.h | 1 + 7 files changed, 122 insertions(+), 5 deletions(-) diff --git a/changes/bug24362 b/changes/bug24362 new file mode 100644 index 000000000..15e393cf3 --- /dev/null +++ b/changes/bug24362 @@ -0,0 +1,2 @@ + o Minor features (logging, android): + - Added support for the Android logging subsystem. Closes ticket 24362. diff --git a/configure.ac b/configure.ac index 82e656d3c..4316f4e09 100644 --- a/configure.ac +++ b/configure.ac @@ -204,6 +204,20 @@ if test x$enable_event_tracing_debug = xyes; then AC_DEFINE([TOR_EVENT_TRACING_ENABLED], [1], [Compile the event tracing instrumentation]) fi +dnl Enable Android only features. +AC_ARG_ENABLE(android, + AS_HELP_STRING(--enable-android, [build with Android features enabled])) +AM_CONDITIONAL([USE_ANDROID], [test "x$enable_android" = "xyes"]) + +if test "x$enable_android" = "xyes"; then + AC_DEFINE([USE_ANDROID], [1], [Compile with Android specific features enabled]) + + dnl Check if the Android log library is available. + AC_CHECK_HEADERS([android/log.h]) + AC_SEARCH_LIBS(__android_log_write, [log]) + +fi + dnl check for the correct "ar" when cross-compiling. dnl (AM_PROG_AR was new in automake 1.11.2, which we do not yet require, dnl so kludge up a replacement for the case where it isn't there yet.) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 1814b8292..b2218e33c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -727,6 +727,11 @@ GENERAL OPTIONS log entries are marked with "Tor-__tag__". Can not be changed while tor is running. (Default: none) +[[AndroidIdentityTag]] **AndroidIdentityTag** __tag__:: + When logging to Android's logging subsystem, adds a tag to the log identity + such that log entries are marked with "Tor-__tag__". Can not be changed while + tor is running. (Default: none) + [[SafeLogging]] **SafeLogging** **0**|**1**|**relay**:: Tor can scrub potentially sensitive strings from log messages (e.g. addresses) by replacing them with the string [scrubbed]. This way logs can diff --git a/src/common/log.c b/src/common/log.c index 80055fda0..ad3d1affd 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -35,6 +35,9 @@ #define LOG_PRIVATE #include "torlog.h" #include "container.h" +#ifdef HAVE_ANDROID_LOG_H +#include <android/log.h> +#endif // HAVE_ANDROID_LOG_H. /** Given a severity, yields an index into log_severity_list_t.masks to use * for that severity. */ @@ -58,6 +61,8 @@ typedef struct logfile_t { int needs_close; /**< Boolean: true if the stream gets closed on shutdown. */ int is_temporary; /**< Boolean: close after initializing logging subsystem.*/ int is_syslog; /**< Boolean: send messages to syslog. */ + int is_android; /**< Boolean: send messages to Android's log subsystem. */ + char *android_tag; /**< Identity Tag used in Android's log subsystem. */ log_callback callback; /**< If not NULL, send messages to this function. */ log_severity_list_t *severities; /**< Which severity of messages should we * log for each log domain? */ @@ -103,6 +108,33 @@ should_log_function_name(log_domain_mask_t domain, int severity) } } +#ifdef HAVE_ANDROID_LOG_H +/** Helper function to convert Tor's log severity into the matching + * Android log priority. + */ +static int +severity_to_android_log_priority(int severity) +{ + switch (severity) { + case LOG_DEBUG: + return ANDROID_LOG_VERBOSE; + case LOG_INFO: + return ANDROID_LOG_DEBUG; + case LOG_NOTICE: + return ANDROID_LOG_INFO; + case LOG_WARN: + return ANDROID_LOG_WARN; + case LOG_ERR: + return ANDROID_LOG_ERROR; + default: + // LCOV_EXCL_START + raw_assert(0); + return 0; + // LCOV_EXCL_STOP + } +} +#endif // HAVE_ANDROID_LOG_H. + /** A mutex to guard changes to logfiles and logging. */ static tor_mutex_t log_mutex; /** True iff we have initialized log_mutex */ @@ -411,7 +443,7 @@ logfile_wants_message(const logfile_t *lf, int severity, if (! (lf->severities->masks[SEVERITY_MASK_IDX(severity)] & domain)) { return 0; } - if (! (lf->fd >= 0 || lf->is_syslog || lf->callback)) { + if (! (lf->fd >= 0 || lf->is_syslog || lf->is_android || lf->callback)) { return 0; } if (lf->seems_dead) { @@ -454,6 +486,11 @@ logfile_deliver(logfile_t *lf, const char *buf, size_t msg_len, syslog(severity, "%s", msg_after_prefix); #endif /* defined(MAXLINE) */ #endif /* defined(HAVE_SYSLOG_H) */ + } else if (lf->is_android) { +#ifdef HAVE_ANDROID_LOG_H + int priority = severity_to_android_log_priority(severity); + __android_log_write(priority, lf->android_tag, msg_after_prefix); +#endif // HAVE_ANDROID_LOG_H. } else if (lf->callback) { if (domain & LD_NOCB) { if (!*callbacks_deferred && pending_cb_messages) { @@ -646,7 +683,7 @@ tor_log_update_sigsafe_err_fds(void) /* Don't try callback to the control port, or syslogs: We can't * do them from a signal handler. Don't try stdout: we always do stderr. */ - if (lf->is_temporary || lf->is_syslog || + if (lf->is_temporary || lf->is_syslog || lf->is_android || lf->callback || lf->seems_dead || lf->fd < 0) continue; if (lf->severities->masks[SEVERITY_MASK_IDX(LOG_ERR)] & @@ -683,7 +720,7 @@ tor_log_get_logfile_names(smartlist_t *out) LOCK_LOGS(); for (lf = logfiles; lf; lf = lf->next) { - if (lf->is_temporary || lf->is_syslog || lf->callback) + if (lf->is_temporary || lf->is_syslog || lf->is_android || lf->callback) continue; if (lf->filename == NULL) continue; @@ -732,6 +769,7 @@ log_free_(logfile_t *victim) return; tor_free(victim->severities); tor_free(victim->filename); + tor_free(victim->android_tag); tor_free(victim); } @@ -1151,6 +1189,39 @@ add_syslog_log(const log_severity_list_t *severity, } #endif /* defined(HAVE_SYSLOG_H) */ +#ifdef HAVE_ANDROID_LOG_H +/** + * Add a log handler to send messages to the Android platform log facility. + */ +int +add_android_log(const log_severity_list_t *severity, + const char *android_tag) +{ + logfile_t *lf = NULL; + + lf = tor_malloc_zero(sizeof(logfile_t)); + lf->fd = -1; + lf->severities = tor_memdup(severity, sizeof(log_severity_list_t)); + lf->filename = tor_strdup("<android>"); + lf->is_android = 1; + + if (android_tag == NULL) + lf->android_tag = tor_strdup("Tor"); + else { + char buf[256]; + tor_snprintf(buf, sizeof(buf), "Tor-%s", android_tag); + lf->android_tag = tor_strdup(buf); + } + + LOCK_LOGS(); + lf->next = logfiles; + logfiles = lf; + log_global_min_severity_ = get_min_log_level(); + UNLOCK_LOGS(); + return 0; +} +#endif // HAVE_ANDROID_LOG_H. + /** If level is a valid log severity, return the corresponding * numeric value. Otherwise, return -1. */ int @@ -1318,7 +1389,8 @@ parse_log_severity_config(const char **cfg_ptr, if (!strcasecmpstart(cfg, "file") || !strcasecmpstart(cfg, "stderr") || !strcasecmpstart(cfg, "stdout") || - !strcasecmpstart(cfg, "syslog")) { + !strcasecmpstart(cfg, "syslog") || + !strcasecmpstart(cfg, "android")) { goto done; } if (got_an_unqualified_range > 1) diff --git a/src/common/torlog.h b/src/common/torlog.h index 65bf41702..b7d033adb 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -146,7 +146,11 @@ int add_file_log(const log_severity_list_t *severity, const char *filename, #ifdef HAVE_SYSLOG_H int add_syslog_log(const log_severity_list_t *severity, const char* syslog_identity_tag); -#endif +#endif // HAVE_SYSLOG_H. +#ifdef HAVE_ANDROID_LOG_H +int add_android_log(const log_severity_list_t *severity, + const char *android_identity_tag); +#endif // HAVE_ANDROID_LOG_H. int add_callback_log(const log_severity_list_t *severity, log_callback cb); void logs_set_domain_logging(int enabled); int get_min_log_level(void); diff --git a/src/or/config.c b/src/or/config.c index 676e7f605..0f662a617 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -403,6 +403,7 @@ static config_var_t option_vars_[] = { V(LogTimeGranularity, MSEC_INTERVAL, "1 second"), V(TruncateLogFile, BOOL, "0"), V(SyslogIdentityTag, STRING, NULL), + V(AndroidIdentityTag, STRING, NULL), V(LongLivedPorts, CSV, "21,22,706,1863,5050,5190,5222,5223,6523,6667,6697,8300"), VAR("MapAddress", LINELIST, AddressMap, NULL), @@ -4692,6 +4693,12 @@ options_transition_allowed(const or_options_t *old, return -1; } + if (!opt_streq(old->AndroidIdentityTag, new_val->AndroidIdentityTag)) { + *msg = tor_strdup("While Tor is running, changing " + "AndroidIdentityTag is not allowed."); + return -1; + } + if ((old->HardwareAccel != new_val->HardwareAccel) || !opt_streq(old->AccelName, new_val->AccelName) || !opt_streq(old->AccelDir, new_val->AccelDir)) { @@ -5743,6 +5750,18 @@ options_init_logs(const or_options_t *old_options, or_options_t *options, #endif /* defined(HAVE_SYSLOG_H) */ goto cleanup; } + + if (!strcasecmp(smartlist_get(elts, 0), "android")) { +#ifdef HAVE_ANDROID_LOG_H + if (!validate_only) { + add_android_log(severity, options->AndroidIdentityTag); + } +#else + log_warn(LD_CONFIG, "Android logging is not supported" + " on this system. Sorry."); +#endif // HAVE_ANDROID_LOG_H. + goto cleanup; + } } if (smartlist_len(elts) == 2 && diff --git a/src/or/or.h b/src/or/or.h index b07802232..aff43f195 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3639,6 +3639,7 @@ typedef struct { int TruncateLogFile; /**< Boolean: Should we truncate the log file before we start writing? */ char *SyslogIdentityTag; /**< Identity tag to add for syslog logging. */ + char *AndroidIdentityTag; /**< Identity tag to add for Android logging. */ char *DebugLogFile; /**< Where to send verbose log messages. */ char *DataDirectory_option; /**< Where to store long-term data, as

1 0

[tor/master] Restructure log initilization function to allow multiple backends without arguments.
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 78a582ed880166a73be284ae799397e84fac36a3 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Dec 11 13:00:48 2017 +0000 Restructure log initilization function to allow multiple backends without arguments. This patch ensures that we more easily can extend our log backends that does not take any additional argument other than a single keyword. This patch is mostly reindentation of some code which is why it is split out into its own patch. See: https://bugs.torproject.org/24362 --- src/or/config.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index bcfac1dae..676e7f605 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5732,16 +5732,17 @@ options_init_logs(const or_options_t *old_options, or_options_t *options, } goto cleanup; } - if (smartlist_len(elts) == 1 && - !strcasecmp(smartlist_get(elts,0), "syslog")) { + if (smartlist_len(elts) == 1) { + if (!strcasecmp(smartlist_get(elts,0), "syslog")) { #ifdef HAVE_SYSLOG_H - if (!validate_only) { - add_syslog_log(severity, options->SyslogIdentityTag); - } + if (!validate_only) { + add_syslog_log(severity, options->SyslogIdentityTag); + } #else - log_warn(LD_CONFIG, "Syslog is not supported on this system. Sorry."); + log_warn(LD_CONFIG, "Syslog is not supported on this system. Sorry."); #endif /* defined(HAVE_SYSLOG_H) */ - goto cleanup; + goto cleanup; + } } if (smartlist_len(elts) == 2 &&

1 0

[tor/master] Fix compilation: logfile_is_external() must accept const*
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 9c604e2bbb10f7637316f2e0e226eb4669b7f4ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 12 09:21:12 2017 -0500 Fix compilation: logfile_is_external() must accept const* --- src/common/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/log.c b/src/common/log.c index 996840a08..ac6d07a92 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -437,7 +437,7 @@ pending_log_message_free_(pending_log_message_t *msg) * handled externally via the system log API, the Android logging API, or is an * external callback function. */ static inline int -logfile_is_external(logfile_t *lf) +logfile_is_external(const logfile_t *lf) { raw_assert(lf); return lf->is_syslog || lf->is_android || lf->callback;

1 0

[tor/master] Simplify explicit conditional checks into an inlined function.
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit cbc465a3d1496d43c9bf28cfaf20d7409a2070b7 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Dec 12 01:17:57 2017 +0000 Simplify explicit conditional checks into an inlined function. This patch lifts the check for whether a given log file (`logfile_t`) is an "external logfile" (handled by an external logging system such as syslog, android's logging subsystem, or as an external C callback function) into a function on its own. See: https://bugs.torproject.org/24362 --- src/common/log.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index ad3d1affd..996840a08 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -433,6 +433,16 @@ pending_log_message_free_(pending_log_message_t *msg) tor_free(msg); } +/** Helper function: returns true iff the log file, given in lf, is + * handled externally via the system log API, the Android logging API, or is an + * external callback function. */ +static inline int +logfile_is_external(logfile_t *lf) +{ + raw_assert(lf); + return lf->is_syslog || lf->is_android || lf->callback; +} + /** Return true iff lf would like to receive a message with the * specified severity in the specified domain. */ @@ -443,7 +453,7 @@ logfile_wants_message(const logfile_t *lf, int severity, if (! (lf->severities->masks[SEVERITY_MASK_IDX(severity)] & domain)) { return 0; } - if (! (lf->fd >= 0 || lf->is_syslog || lf->is_android || lf->callback)) { + if (! (lf->fd >= 0 || logfile_is_external(lf))) { return 0; } if (lf->seems_dead) { @@ -683,8 +693,8 @@ tor_log_update_sigsafe_err_fds(void) /* Don't try callback to the control port, or syslogs: We can't * do them from a signal handler. Don't try stdout: we always do stderr. */ - if (lf->is_temporary || lf->is_syslog || lf->is_android || - lf->callback || lf->seems_dead || lf->fd < 0) + if (lf->is_temporary || logfile_is_external(lf) + || lf->seems_dead || lf->fd < 0) continue; if (lf->severities->masks[SEVERITY_MASK_IDX(LOG_ERR)] & (LD_BUG|LD_GENERAL)) { @@ -720,7 +730,7 @@ tor_log_get_logfile_names(smartlist_t *out) LOCK_LOGS(); for (lf = logfiles; lf; lf = lf->next) { - if (lf->is_temporary || lf->is_syslog || lf->is_android || lf->callback) + if (lf->is_temporary || logfile_is_external(lf)) continue; if (lf->filename == NULL) continue;

1 0

[tor/master] Merge remote-tracking branch 'ahf-oniongit/bugs/24362'
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 6c5a73f87abc6a8791e41e9d7f3728d67145001c Merge: 21ee765df cbc465a3d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 12 09:18:52 2017 -0500 Merge remote-tracking branch 'ahf-oniongit/bugs/24362' changes/bug24362 | 2 ++ configure.ac | 14 ++++++++ doc/tor.1.txt | 5 +++ src/common/log.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++--- src/common/torlog.h | 6 +++- src/or/config.c | 34 ++++++++++++++++---- src/or/or.h | 1 + 7 files changed, 141 insertions(+), 13 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'teor/log24558'
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 21ee765df0a2f20b6de21af0f4e10dc80d6fd68b Merge: 644ec835d 2ff706ba0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 12 09:16:12 2017 -0500 Merge remote-tracking branch 'teor/log24558' configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/master] Make configure log messages less confusing during static builds
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 2ff706ba02e9be0735af59c76a6846f652ef2a69 Author: teor <teor2345(a)gmail.com> Date: Tue Dec 12 12:43:53 2017 +1100 Make configure log messages less confusing during static builds Closes #24558. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ee75d3a29..289f07d1c 100644 --- a/configure.ac +++ b/configure.ac @@ -988,12 +988,12 @@ if test "$fragile_hardening" = "yes"; then TOR_TRY_COMPILE_WITH_CFLAGS([-fsanitize=address], also_link, CFLAGS_ASAN="-fsanitize=address", true) if test "$tor_cv_cflags__fsanitize_address" = "yes" && test "$tor_can_link__fsanitize_address" != "yes"; then - AC_MSG_ERROR([The compiler supports -fsanitize=address, but for some reason I was not able to link when using it. Are you missing run-time support? With GCC you need libubsan.so, and with Clang you need libclang_rt.ubsan*]) + AC_MSG_ERROR([The compiler supports -fsanitize=address, but for some reason I was not able to link when using it. Are you missing run-time support? With GCC you need libubsan.*, and with Clang you need libclang_rt.ubsan*]) fi TOR_TRY_COMPILE_WITH_CFLAGS([-fsanitize=undefined], also_link, CFLAGS_UBSAN="-fsanitize=undefined", true) if test "$tor_cv_cflags__fsanitize_address" = "yes" && test "$tor_can_link__fsanitize_address" != "yes"; then - AC_MSG_ERROR([The compiler supports -fsanitize=undefined, but for some reason I was not able to link when using it. Are you missing run-time support? With GCC you need libasan.so, and with Clang you need libclang_rt.ubsan*]) + AC_MSG_ERROR([The compiler supports -fsanitize=undefined, but for some reason I was not able to link when using it. Are you missing run-time support? With GCC you need libasan.*, and with Clang you need libclang_rt.ubsan*]) fi TOR_CHECK_CFLAGS([-fno-omit-frame-pointer])

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 706e6893d16e2097d9da4511060372c21f1cd24b Merge: 58f974818 4c54021ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23682 | 5 ----- 1 file changed, 5 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 4c54021baf4d22debc0381ae07edd911252dcd85 Merge: 4593f5a6e 31ce03a2b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug23682 | 5 ----- 1 file changed, 5 deletions(-)

1 0