commit a034863b45455a2def6d957d54bec2530db4a1a6
Merge: fcc78e5 8ef6cdc
Author: Nick Mathewson <[email protected]>
Date: Tue Jan 6 14:15:08 2015 -0500
Merge remote-tracking branch 'public/bug12509_025'
changes/bug12509 | 4 ++++
src/or/addressmap.c | 2 ++
src/or/config.c | 9 ---------
src/or/or.h | 5 +++--
4 files changed, 9 insertions(+), 11 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
