commit d6fa8239c86f49413e9ee86765059f43ceeb06c6 Merge: 573d627 4a6f5bb Author: Nick Mathewson <[email protected]> Date: Fri Aug 29 16:13:04 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.5'
changes/bug12997 | 3 +++
src/or/rendmid.c | 11 +++++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
