commit ee250be6a66b4e2cf62a9dad8a6650634643c977 Merge: d7d6529 a3f6f33 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 12 21:14:31 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug8965 | 3 + doc/TODO | 3 - doc/contrib/authority-policy.txt | 89 ------------------- doc/contrib/tor-rpm-creation.txt | 56 ++++++++++++ doc/contrib/torel-design.txt | 181 ------------------------------------- doc/include.am | 2 - doc/spec/README | 11 --- doc/tor-rpm-creation.txt | 56 ------------ doc/tor-win32-mingw-creation.txt | 119 ------------------------- doc/translations.txt | 182 -------------------------------------- doc/v3-authority-howto.txt | 84 ------------------ 11 files changed, 59 insertions(+), 727 deletions(-)
tor-commits@lists.torproject.org