Commit 7591ce64 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

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

parents 7bc7188f 9e468555

changes/bufferevent_compilation

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

    - Fix compilation when building with bufferevents enabled. (This

      configuration is still not expected to work, however.)

      Fixes bugs 12438, 12474; bugfixes on 0.2.5.1-alpha. Patches

      from Anthony G. Basile.

changes/bug8387

0 → 100644
+11 −0
Original line number Diff line number Diff line 
  o Major bugfixes (client):



    - Perform circuit cleanup operations even when circuit

      construction operations are disabled (because the network is

      disabled, or because there isn't enough directory information).

      Previously, when we were not building predictive circuits, we

      were not closing expired circuits either.



      Fixes bug 8387; bugfix on 0.1.1.11-alpha. This bug became visible

      in 0.2.4.10-alpha when we became more strict about when we have

      "enough directory information to build circuits".

changes/further-12184-diagnostic

0 → 100644
+2 −0
Original line number Diff line number Diff line 
  o Minor features (diagnostic):

    - Slightly enhance the diagnostic message for bug 12184.

configure.ac

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ AC_CHECK_MEMBERS([struct event.min_heap_idx], , , 
[#include <event.h>

])



AC_CHECK_HEADERS(event2/event.h event2/dns.h)

AC_CHECK_HEADERS(event2/event.h event2/dns.h event2/bufferevent_ssl.h)



LIBS="$save_LIBS"

LDFLAGS="$save_LDFLAGS"

src/or/circuitbuild.c

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ get_unique_circ_id_by_chan(channel_t *chan) 
      if (0)

        circuitmux_assert_okay(chan->cmux);



      channel_dump_statistics(chan, LOG_WARN);



      return 0;

    }