[tor-commits] [tor/master] Merge remote-tracking branch 'public/Fix_19450'

[nickm@xxxxxxxxxxxxxx]

commit 7f145b54afb2cb1d9390a65bf31e2dddeb5b87da
Merge: 14d58bb bbc9cbd
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Aug 12 16:11:28 2016 -0400

    Merge remote-tracking branch 'public/Fix_19450'

 changes/19450                   |   3 +
 configure.ac                    |  36 ----
 doc/tor.1.txt                   |  20 --
 src/common/compat_libevent.c    | 113 +----------
 src/common/compat_libevent.h    |  19 +-
 src/common/tortls.c             |  79 --------
 src/common/tortls.h             |   8 -
 src/or/buffers.c                | 419 +--------------------------------------
 src/or/buffers.h                |  42 +---
 src/or/channeltls.c             |   2 +
 src/or/config.c                 |  26 +--
 src/or/connection.c             | 430 ++--------------------------------------
 src/or/connection.h             |  26 +--
 src/or/connection_edge.c        |  25 +--
 src/or/connection_or.c          | 153 +-------------
 src/or/control.c                |  13 +-
 src/or/directory.c              |  14 +-
 src/or/ext_orport.c             |   7 +-
 src/or/main.c                   | 198 +-----------------
 src/or/or.h                     |  84 +-------
 src/or/relay.c                  |  16 +-
 src/test/test_buffers.c         |  89 ++++-----
 src/test/test_channeltls.c      |   3 +-
 src/test/test_compat_libevent.c |   3 -
 src/test/test_oom.c             |  11 +-
 25 files changed, 116 insertions(+), 1723 deletions(-)

diff --cc src/or/connection.h
index 4417b89,c219ea4..f8e0f73
--- a/src/or/connection.h
+++ b/src/or/connection.h
@@@ -52,13 -52,11 +52,11 @@@ void connection_mark_for_close_internal
   * For all other cases, use connection_mark_and_flush() instead, which
   * checks for or_connection_t properly, instead.  See below.
   */
 -#define connection_mark_and_flush_internal_(c,line,file)                  \
 -  do {                                                                    \
 -    connection_t *tmp_conn_ = (c);                                        \
 -    connection_mark_for_close_internal_(tmp_conn_, (line), (file));       \
 -    tmp_conn_->hold_open_until_flushed = 1;                               \
 +#define connection_mark_and_flush_internal_(c,line,file)                \
 +  do {                                                                  \
 +    connection_t *tmp_conn__ = (c);                                     \
 +    connection_mark_for_close_internal_(tmp_conn__, (line), (file));    \
 +    tmp_conn__->hold_open_until_flushed = 1;                            \
-     IF_HAS_BUFFEREVENT(tmp_conn__,                                      \
-                        connection_start_writing(tmp_conn__));           \
    } while (0)
  
  #define connection_mark_and_flush_internal(c)            \

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits