[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge branch 'ticket2325_squashed'
commit 382c27d8a9b5738356a575fc19fd0db1056293bf
Merge: 2d3f88f 9d237bb
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Wed Jul 22 12:24:21 2015 -0400
Merge branch 'ticket2325_squashed'
changes/ticket2325 | 7 ++
doc/include.am | 3 +-
doc/torrc_format.txt | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/common/util.c | 33 +-------
4 files changed, 216 insertions(+), 32 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits