commit d3382297fea0317880acb2c9d7d323be5027ff41
Merge: 01b23a6 530fac1
Author: Nick Mathewson <ni...@torproject.org>
Date: Mon Sep 22 10:42:54 2014 -0400
Merge remote-tracking branch 'arma/feature13153'
changes/feature13153 | 5 +++++
src/or/circuituse.c | 33 ++++++++++++++++-----------------
src/or/or.h | 3 ---
src/or/routerparse.c | 3 ---
4 files changed, 21 insertions(+), 23 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
