commit f9478b7a796a784a2d8f12fb9701ce7d1ea1ace2 Merge: 0b6fb5e 4cac5df Author: Nick Mathewson <ni...@torproject.org> Date: Tue Jul 17 12:03:10 2012 -0400
Merge remote-tracking branch 'origin/maint-0.2.3'
changes/port_doc | 3 +++
src/or/config.c | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
