commit 27c1b0ea4330e4aee8b464543bbe03b932005368 Merge: 2384256 6027429 Author: Nick Mathewson <ni...@torproject.org> Date: Wed May 4 15:13:15 2016 -0400
Merge branch 'maint-0.2.8'
changes/bug18312 | 4 ++++
doc/tor.1.txt | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
