[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/maint-0.2.5] Merge remote-tracking branch 'public/bug8387_024' into maint-0.2.5
commit 856114ab1c5a8a7a1b7993ee34adbb7cbf4eaa10
Merge: 35791f4 ed3d789
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Wed Jul 16 10:01:56 2014 +0200
Merge remote-tracking branch 'public/bug8387_024' into maint-0.2.5
changes/bug8387 | 11 +++++++++++
src/or/circuituse.c | 27 ++++++++++++++++++++++-----
src/or/circuituse.h | 1 +
src/or/main.c | 5 ++++-
4 files changed, 38 insertions(+), 6 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits