commit e3c143f5214b4a2d37dbb47940eaf2cc2e212f86
Merge: 67c0ad5 efcab43
Author: Nick Mathewson <ni...@torproject.org>
Date: Tue Sep 2 11:58:08 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.5'
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 ++-
8 files changed, 25 insertions(+), 5 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
