commit 58764d8ec6799fc5ea91bcbb1655071f869bb753 Author: Roger Dingledine arma@torproject.org Date: Mon Nov 21 18:42:07 2011 -0500

apparently or_options_t likes being a const in master --- src/or/dirserv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 64db94d..9885066 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1864,7 +1864,7 @@ dirserv_compute_performance_thresholds(routerlist_t *rl) long *tks; double *mtbfs, *wfus; time_t now = time(NULL); - or_options_t *options = get_options(); + const or_options_t *options = get_options();

/* initialize these all here, in case there are no routers */ stable_uptime = 0;