commit 583a387c1ea855c0b063f14c382b2cedcdc3dc08 Merge: c2c23d1 f18ee7f Author: Nick Mathewson <[email protected]> Date: Thu Jun 18 11:33:24 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.6'
changes/bug16381 | 13 +++++++++++++
src/or/rendcommon.c | 10 ++++++++--
2 files changed, 21 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
