[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'

[nickm at torproject.org]

commit 7591ce64fbaae8d480224a93d62abda10011c2ba
Merge: 7bc7188 9e46855
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 16 11:01:20 2014 +0200

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

 changes/bufferevent_compilation  |    5 ++++
 changes/bug8387                  |   11 +++++++
 changes/further-12184-diagnostic |    2 ++
 configure.ac                     |    2 +-
 src/or/circuitbuild.c            |    2 ++
 src/or/circuituse.c              |   36 +++++++++++++++++++----
 src/or/circuituse.h              |    1 +
 src/or/connection.c              |   60 +++++++++++++++++++-------------------
 src/or/main.c                    |    5 +++-
 9 files changed, 87 insertions(+), 37 deletions(-)

diff --cc src/or/router.c
index 4fcd4a5,2cdbb0c..4fcd4a5
mode 100755,100644..100644
--- a/src/or/router.c
+++ b/src/or/router.c