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

[nickm at torproject.org]

commit 475c95f28a70fff665a4b6a608a4d3a61c2c77d9
Merge: b969ee9 efcab43
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 2 12:07:39 2014 -0400

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

 changes/bug12878     |    3 +++
 changes/ticket13036  |    5 +++++
 src/common/address.c |    2 ++
 src/or/circuitmux.c  |    8 +++++++-
 src/or/connection.c  |    1 +
 src/or/control.c     |    5 +++--
 src/or/dirvote.c     |    4 ++++
 src/or/rephist.c     |    2 +-
 src/or/routerparse.c |    3 ++-
 9 files changed, 28 insertions(+), 5 deletions(-)