commit fc5cab44724e8328e2186f22114625388f1c8f0d Merge: a5cc5ad ab4b296 Author: Nick Mathewson <[email protected]> Date: Thu Oct 16 13:29:14 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.5'
changes/bug8093 | 3 +++
src/or/relay.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
