[tor-commits] [tor/master] Merge branch 'prop140_aftermath_url_v3'
nickm at torproject.org
nickm at torproject.org
Mon May 15 22:18:15 UTC 2017
commit 6e2eb0afdb34955583ed231058adbe06c4625b0f
Merge: afef059 e1b3c1b
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon May 15 18:05:32 2017 -0400
Merge branch 'prop140_aftermath_url_v3'
src/or/directory.c | 210 +++++++++++++++++++++++++++++++++--------
src/or/protover.c | 2 +-
src/test/test_dir_handle_get.c | 3 +-
3 files changed, 171 insertions(+), 44 deletions(-)
More information about the tor-commits
mailing list