commit 34fa4ad637ae3997b0ae31f2009a8aacc6261626 Merge: fec3091 a7eae4d Author: Nick Mathewson <[email protected]> Date: Wed Apr 1 12:59:19 2015 -0400
Merge remote-tracking branch 'public/bug15515_025'
changes/bug15515 | 4 ++++
src/or/or.h | 3 +++
src/or/rendmid.c | 13 +++++++++++++
3 files changed, 20 insertions(+)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
