commit eaa69a22893bf51223687091f52af5b62e8a327a
Merge: e033126 ff843ed
Author: Nick Mathewson <[email protected]>
Date: Mon Dec 14 13:30:30 2015 -0500
Merge branch 'maint-0.2.7' into release-0.2.7
Makefile.am | 7 +++++++
changes/bug17818 | 3 +++
src/or/include.am | 3 ---
src/test/include.am | 11 ++++++-----
4 files changed, 16 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
