[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm@xxxxxxxxxxxxxx]

commit eafcd7b0fccb0993d6c8bcaabc40231d0bdb5289
Merge: 5910292 7babf33
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Apr 12 13:02:37 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/bug18481        |   5 +++
 changes/bug18716        |   4 ++
 doc/tor.1.txt           | 100 +++++++++++++++++++++++-------------------------
 src/common/memarea.c    |   4 +-
 src/or/config.c         |  60 +++++++++++++----------------
 src/or/directory.c      |   6 +--
 src/or/networkstatus.c  |   6 +--
 src/or/or.h             |  12 +++---
 src/test/test_options.c |   6 +--
 9 files changed, 100 insertions(+), 103 deletions(-)

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