[tor-commits] [tor/master] Merge remote-tracking branch 'arma/task19035-fixedup'

[nickm@xxxxxxxxxxxxxx]

commit 1e5ad15688ee3f3660fe35cab23022126b55262d
Merge: 617b920 3b83da1
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri May 27 13:22:16 2016 -0400

    Merge remote-tracking branch 'arma/task19035-fixedup'

 changes/task19035              |   5 ++
 configure.ac                   |   6 --
 src/or/circuitbuild.c          |   3 -
 src/or/control.c               |   3 -
 src/or/directory.c             | 197 ++++-------------------------------------
 src/or/or.h                    |   8 --
 src/test/test_dir_handle_get.c |  46 ----------
 7 files changed, 22 insertions(+), 246 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits